<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> e5e300f (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 07edb26 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 59f060e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> eda022f (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> f1f4057 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 590c4c7 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> e6da150 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 9710ee6 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> 4d1f738 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5bc98da (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) >>>>>>> e5e300f (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 1ebea35 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) >>>>>>> 07edb26 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 078304c (Rebased) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 59f060e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 7f9bd73 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f1f4057 (Manifest_cache true) ======= ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 2737f2d (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 4d1f738 (Manifest_cache true) >>>>>>> eda022f (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 590c4c7 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 7f9bd73 (Manifest_cache true) >>>>>>> e6da150 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> f1c7248 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9710ee6 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) Code coverage for Bookstore
loading
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 4f1a459 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) ======= >>>>>>> aa4fb26 (Add sort orders) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages)
Generated 2022-10-07T16:34:44+03:00
>>>>>>> 1cb2e82 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages)
Generated 2022-10-07T13:38:31+03:00
>>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 851b4c0 (Fix) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 8ad6192 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages)
Generated 2022-10-07T13:38:31+03:00
>>>>>>> a2de409 (Featire specs) >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> e031bce (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 551615f (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 12bcf81 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> e50f73e (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
Generated 2022-10-06T17:07:21+03:00
>>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages)
Generated 2022-09-06T10:36:10+03:00
======= <<<<<<< HEAD
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 27ceb6f (Add login registration pages) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true)
Generated 2022-10-06T17:07:21+03:00
======= ======= >>>>>>> 96aecde (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 7945032 (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b00b319 (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 904663c (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> b459807 (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 7d58507 (Add login registration pages) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) >>>>>>> 851b4c0 (Fix) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true)
Generated 2022-10-06T17:07:21+03:00
======= ======= >>>>>>> 96aecde (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true)
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true)
Generated 2022-10-07T16:34:44+03:00
>>>>>>> c1749d5 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 8ad6192 (Fix) ======= ======= ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true)
Generated 2022-10-07T13:38:31+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e965665 (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> ea0650c (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b26425c (Add login registration pages) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> a038b16 (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> a77cc8a (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 845289f (Add login registration pages) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 39467b5 (Manifest_cache true) ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 569a007 (Add login registration pages) ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= =======
Generated 2022-10-07T16:34:44+03:00
>>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> cde4834 (Manifest_cache true) ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= =======
Generated 2022-10-06T17:07:21+03:00
>>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true)
Generated 2022-10-06T17:07:21+03:00
======= ======= >>>>>>> 96aecde (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
>>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true)
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 864f339 (Featire specs) =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= =======
Generated 2022-10-06T18:33:49+03:00
>>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
Generated 2022-10-06T18:57:15+03:00
>>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
Generated 2022-10-06T18:57:15+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= =======
Generated 2022-10-07T13:29:03+03:00
>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= =======
Generated 2022-10-07T13:38:31+03:00
>>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 4f1a459 (Fix) ======= ======= ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true)
Generated 2022-10-07T13:38:31+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= =======
Generated 2022-10-07T16:34:44+03:00
>>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true)
Generated 2022-10-07T16:34:44+03:00
=======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
=======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= =======
Generated 2022-09-05T19:21:30+03:00
>>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= =======
Generated 2022-09-06T10:36:10+03:00
>>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= =======
Generated 2022-09-06T11:37:55+03:00
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= =======
Generated 2022-09-06T17:39:47+03:00
>>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= =======
Generated 2022-10-09T15:09:44+03:00
>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= =======
Generated 2022-10-12T13:22:27+03:00
>>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method) <<<<<<< HEAD >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) ======= =======
Generated 2022-10-17T14:15:31+03:00
>>>>>>> 25f3c50 (Add sort orders) >>>>>>> aa4fb26 (Add sort orders)

All Files ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 851b4c0 (Fix) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 8ad6192 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages) 93.06% >>>>>>> fe7e312 (Manifest_cache true) >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) 95.44% >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 4f1a459 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) 95.44% >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 95.79% >>>>>>> f182ac7 (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> e031bce (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 551615f (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 12bcf81 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 03c0867 (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) 95.71% >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) 90.68% ======= <<<<<<< HEAD 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= 95.71% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) 95.71% ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) 95.44% >>>>>>> 864f339 (Featire specs) ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f5da5ac (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 3e9f99d (Featire specs) ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 036bb32 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 8874887 (Manifest_cache true) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 697ad44 (Add login registration pages) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= 95.71% >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) 95.79% ======= 95.44% >>>>>>> 4e7b845 (Manifest_cache true) ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e0a8d9 (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e0a8d9 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bcd09ab (Featire specs) ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 022e63e (Manifest_cache true) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> c006a44 (Featire specs) ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 10bdfea (Manifest_cache true) ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> af9487a (Add login registration pages) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> cae047f (Manifest_cache true) ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b40a04e (Manifest_cache true) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> a9e654b (Manifest_cache true) ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3a43955 (Add login registration pages) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 0c3a150 (Add login registration pages) ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= 95.44% >>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 851b4c0 (Fix) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= 95.71% >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 8ad6192 (Fix) ======= ======= ======= >>>>>>> 866aee4 (Manifest_cache true) 95.44% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= 93.06% >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= 90.68% >>>>>>> cde4834 (Manifest_cache true) ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= 95.71% >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) 95.71% ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) 95.44% >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) 93.06% >>>>>>> c1749d5 (Featire specs) ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= ======= 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) 95.79% ======= 95.44% >>>>>>> 4e7b845 (Manifest_cache true) ======= 93.06% >>>>>>> b8aab1a (Manifest_cache true) ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= 99.2% ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= ======= 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= 95.44% >>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 4f1a459 (Fix) ======= ======= ======= >>>>>>> 866aee4 (Manifest_cache true) 95.44% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 01d9256 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> b26425c (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 845289f (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD >>>>>>> 569a007 (Add login registration pages) ======= ======= 93.06% >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> e991554 (Manifest_cache true) 93.06% ======= 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= ======= 99.11% >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= 99.11% >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= 92.45% >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= <<<<<<< HEAD 89.69% >>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method) <<<<<<< HEAD >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) ======= ======= 88.25% >>>>>>> 25f3c50 (Add sort orders) >>>>>>> aa4fb26 (Add sort orders) covered at <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 4f1a459 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages) 3.25 >>>>>>> 1cb2e82 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) 3.34 >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 851b4c0 (Fix) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 8ad6192 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) 3.34 >>>>>>> a2de409 (Featire specs) >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) 3.03 >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> e031bce (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 551615f (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 12bcf81 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> e50f73e (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) 2.92 >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) 1.04 ======= <<<<<<< HEAD 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= 3.92 >>>>>>> 752f0c0 (Featire specs) ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) ======= 3.9 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 2.92 >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= 2.92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) 2.92 ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) 3.34 >>>>>>> 864f339 (Featire specs) ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f5da5ac (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 3e9f99d (Featire specs) ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 036bb32 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 8874887 (Manifest_cache true) ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 697ad44 (Add login registration pages) ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= 2.92 >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) 3.03 ======= 3.34 >>>>>>> 4e7b845 (Manifest_cache true) ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e0a8d9 (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e0a8d9 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> bcd09ab (Featire specs) ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> 022e63e (Manifest_cache true) ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> c006a44 (Featire specs) ======= ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 10bdfea (Manifest_cache true) ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> af9487a (Add login registration pages) ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> cae047f (Manifest_cache true) ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b40a04e (Manifest_cache true) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> a9e654b (Manifest_cache true) ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3a43955 (Add login registration pages) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 0c3a150 (Add login registration pages) ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= 3.34 >>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 851b4c0 (Fix) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= 2.92 >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= 3.34 >>>>>>> 446d79a (Fix) >>>>>>> 8ad6192 (Fix) ======= ======= ======= >>>>>>> 866aee4 (Manifest_cache true) 3.34 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= 3.25 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= 1.04 >>>>>>> cde4834 (Manifest_cache true) ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) ======= 4.05 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= 2.92 >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) 2.92 ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) 3.34 >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) 3.25 >>>>>>> c1749d5 (Featire specs) ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= ======= 0.7 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= <<<<<<< HEAD 3.03 <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) 3.03 ======= 3.34 >>>>>>> 4e7b845 (Manifest_cache true) ======= 3.25 >>>>>>> b8aab1a (Manifest_cache true) ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= 4.05 ======= 1.04 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= ======= 3.92 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= ======= 3.36 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= 3.34 >>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 4f1a459 (Fix) ======= ======= ======= >>>>>>> 866aee4 (Manifest_cache true) 3.34 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 01d9256 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> b26425c (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 845289f (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD >>>>>>> 569a007 (Add login registration pages) ======= ======= 3.25 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> e991554 (Manifest_cache true) 3.25 ======= 3.92 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= 1.04 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= ======= 3.92 >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= 1.04 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= 1.04 >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= 1.04 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= 1.04 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= 3.92 >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= 1.04 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= ======= 4.05 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= ======= 3.9 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= 3.38 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= 3.25 >>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method) >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) hits/line )

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> e031bce (Manifest_cache true) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 02ba384 (Manifest_cache true) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 27ceb6f (Add login registration pages) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) 34 files in total. ======= <<<<<<< HEAD 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 92 files in total. <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) 92 files in total. ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) 112 files in total. >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages) 114 files in total. >>>>>>> 8577deb (Featire specs) ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) 92 files in total. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) 92 files in total. ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) 112 files in total. >>>>>>> 864f339 (Featire specs) ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= 92 files in total. >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> ee5935f (Manifest_cache true) ======= 92 files in total. >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true)
1118 relevant lines, 1070 lines covered and 48 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) 90.68% ======= 99.2% ======= 34 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57da3ff (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57da3ff (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> 8be9029 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= ======= ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57da3ff (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
400 relevant lines, 397 lines covered and ======= >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
<<<<<<< HEAD 377 relevant lines, 374 lines covered and >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 400 relevant lines, 397 lines covered and >>>>>>> 57a2e05 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) 99.11% >>>>>>> d0dc1f1 (Featire specs) ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) 90.68% >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> f764a87 (Fix book_spec decrease quantity and price) 90.68% <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) =======
377 relevant lines, 374 lines covered and >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> 697ad44 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) 99.11% >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> d96cf3b (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) =======
377 relevant lines, 374 lines covered and >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> 0c3a150 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) 99.11% >>>>>>> 4e81ea2 (Featire specs) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= 41 files in total. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true) ======= 34 files in total. >>>>>>> cde4834 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 95.71% >>>>>>> aca90e3 (Rebased) ======= ======= ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 926dfe5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and =======
377 relevant lines, 374 lines covered and >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and >>>>>>> a624084 (Add login registration pages) 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> df37394 (Featire specs) ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 715fac2 (Featire specs) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d66884b (Manifest_cache true) 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= ======= ======= >>>>>>> 5507b42 (Featire specs) 41 files in total. ======= 34 files in total. <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed97c39 (Manifest_cache true) 99.11% <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD ======= ======= 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD 47 files in total. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> e1f4d17 (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true) ======= 47 files in total. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 26b462d (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= 112 files in total.
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= 95.44% >>>>>>> 446d79a (Fix) >>>>>>> 851b4c0 (Fix) ======= ======= ======= ======= >>>>>>> 5506bd0 (Featire specs) 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bebaea7 (Rebased) ======= 49 files in total.
370 relevant lines, 257 lines covered and 113 lines missed. ( 69.46% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> fb10fe4 (Add login registration pages) 114 files in total. >>>>>>> c1749d5 (Featire specs) ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( >>>>>>> f861b82 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true) ======= 47 files in total. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 52 files in total. >>>>>>> 730a8ca (Add login registration pages)
400 relevant lines, 397 lines covered and 3 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) 112 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) 95.44% <<<<<<< HEAD >>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 8ad6192 (Fix) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) ======= 52 files in total.
400 relevant lines, 397 lines covered and 3 lines missed. ( 99.25% >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 055b00f (Add login registration pages) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b26425c (Add login registration pages) ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 845289f (Add login registration pages) ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) 114 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1441 relevant lines, 1341 lines covered and 100 lines missed. ( <<<<<<< HEAD 93.06% <<<<<<< HEAD >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= 90.68% >>>>>>> cde4834 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 20256f8 (Featire specs) 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) 95.71% <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) 92 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1141 relevant lines, 1093 lines covered and 48 lines missed. ( <<<<<<< HEAD 95.79% <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) 112 files in total. ======= 47 files in total. >>>>>>> 7375d4b (Manifest_cache true)
1338 relevant lines, 1277 lines covered and 61 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 95.74% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) 95.44% <<<<<<< HEAD >>>>>>> 446d79a (Fix) <<<<<<< HEAD >>>>>>> 4f1a459 (Fix) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 02a399d (Manifest_cache true) ======= 99.2% ======= 34 files in total. >>>>>>> 7375d4b (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD <<<<<<< HEAD 99.11% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= 90.68% >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= ======= 90.68% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> bd8bda4 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= 90.68% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> aa7b40c (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= 90.68% >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 183b6c5 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= 90.68% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> fd6db03 (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= 90.68% >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= 41 files in total. ======= 34 files in total. >>>>>>> 998f08d (Manifest_cache true)
161 relevant lines, 146 lines covered and 15 lines missed. ( <<<<<<< HEAD 99.11% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= 90.68% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= ======= 99.2% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= ======= 99.25% >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= 120 files in total.
1523 relevant lines, 1408 lines covered and 115 lines missed. ( 92.45% >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= 123 files in total.
1609 relevant lines, 1420 lines covered and 189 lines missed. ( <<<<<<< HEAD 89.69% >>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method) <<<<<<< HEAD >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) ======= ======= 88.25% >>>>>>> 25f3c50 (Add sort orders) >>>>>>> aa4fb26 (Add sort orders) )
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD ======= ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b8aab1a (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) ======= >>>>>>> 25f3c50 (Add sort orders) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 25f3c50 (Add sort orders) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 446d79a (Fix) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) ======= >>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method) ======= >>>>>>> 25f3c50 (Add sort orders) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> d15fe1d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= ======= ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d15fe1d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d15fe1d (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> eaef86a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d96cf3b (Featire specs) <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD >>>>>>> eaef86a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= >>>>>>> eaef86a (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> eaef86a (Fix) >>>>>>> d15fe1d (Fix) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b4763a2 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= ======= >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) >>>>>>> bc0ff2c (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 95ebdc2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 8c32a77 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 9bebee5 (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bcd09ab (Featire specs) <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 022e63e (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 9dc109d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 9ca3b84 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) >>>>>>> eaef86a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 20256f8 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8c32a77 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 078304c (Rebased) ======= >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 8b420cf (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 2471c87 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages) >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2471c87 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 2471c87 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) >>>>>>> c033601 (Rebased) ======= ======= ======= ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 01d9256 (Add login registration pages) ======= ======= ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> b26425c (Add login registration pages) ======= ======= ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 845289f (Add login registration pages) ======= ======= ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b8aab1a (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> fb10fe4 (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 69eb97e (Add login registration pages) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 089f8cf (Add login registration pages) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 836a973 (Rebased) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= ======= ======= >>>>>>> aa4fb26 (Add sort orders) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) <<<<<<< HEAD ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> d780a52 (Rebased) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> b28889f (Fix) >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 25f3c50 (Add sort orders) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= ======= >>>>>>> b8aab1a (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> e50f73e (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 27ceb6f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 61908af (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 60943cc (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2471c87 (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 69eb97e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 089f8cf (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fd74f (Featire specs) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 58d403b (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> b575a28 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 5caffae (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 27ceb6f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> cb74525 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> cb74525 (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 65459e8 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> af9487a (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 1577aeb (Rebased) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b35d1f8 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 56ef3ac (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 5caffae (Add login registration pages) ======= ======= ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 0edd9b7 (Add login registration pages) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 01d9256 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> b26425c (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 845289f (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 65f3409 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 65f3409 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= ======= ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) >>>>>>> 04108c4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 6edce20 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7f7abc (Manifest_cache true) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 307ac6e (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4552227 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 27e3351 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= >>>>>>> b4763a2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= ======= >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 78d0719 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 0005d4a (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= >>>>>>> 8577deb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method) >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) >>>>>>> 5f79779 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 852864e (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 282f108 (Add login registration pages) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 0005d4a (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> 0fc3bf0 (Add login registration pages) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> d15fe1d (Fix) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= ======= >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 56a05fb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) >>>>>>> b35d1f8 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 27ceb6f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 65f3409 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e991554 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8577deb (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= >>>>>>> 904663c (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= ======= ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> ab67c96 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 6edce20 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
File % covered Lines Relevant Lines Lines covered Lines missed Avg. Hits / Line
app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rb 100.00 % 36 22 22 0 1.95
app/admin/books.rb 100.00 % 57 41 41 0 2.49
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 4 4.71
app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rb 100.00 % 36 22 22 0 1.95
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/dashboard.rb 42.86 % 14 7 3 4 5.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rb 100.00 % 36 22 22 0 1.95
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rb 100.00 % 3 2 2app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rb 100.00 % 36 22 22 0 1.95
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rb 20.83 % 36 24 5 19 0.21
app/admin/dashboard.rb42.86 % 14 7 3 4 5.86app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 %44.44 %18 9 4 5 4.67
app/admin/orders.rb 19.23 % 38 26 5 21 0.19
app/controllers/application_controller.rb 100.00 % 15 10 10 0 53.00
app/controllers/books_controller.rb 93.75 % 31 16 15 1 14.94
app/controllers/checkouts_controller.rb 100.00 % 16 10 10 0 1.30
app/controllers/coupons_controller.rb 100.00 % 14 8 8 0 2.88
app/controllers/home_controller.rb 100.00 % 12 7 7 0 8.29
app/controllers/order_books_controller.rb 82.86 % 62 35 29 6 1.74
app/controllers/orders_controller.rb 100.00 % 14 8 8 0 3.38
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 1212 024.5012.7090.00 % 18 109 1 0.9010 0 12.9027.5827.5027.5012.7090.00 % 18 109 1 0.9010 0 12.9028.42
app/decorators/order_book_decorator.rb 100.00 % 9 5 5 01.0012 025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.402.60
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb 100.00 % 13 8 8 014.7513.7517.75
app/decorators/paginating_decorator.rb 100.00 % 3552 2app/controllers/application_controller.rbapp/decorators/author_decorator.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 910 1.00
app/admin/dashboard.rb42.86 % 14 7 3 4 5.86app/controllers/books_controller.rb 100.00 % 28 14 14 013.86app/controllers/books_controller.rb 100.00 %13.36app/controllers/books_controller.rb 100.00 %app/controllers/books_controller.rb 100.00 %24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 %44.44 %18 9 4 5 4.67
app/admin/orders.rb 100.00 % 3 2 2 0 1.00
app/controllers/application_controller.rb 100.00 % 15 10 10 0 47.20
app/controllers/books_controller.rb 93.75 % 31 16 15 1 14.94
app/controllers/coupons_controller.rb 100.00 % 14 8 8 0 2.8813.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/order_books_controller.rb 80.65 % 54 31 25 6 1.81
app/controllers/orders_controller.rb 100.00 % 7 4 4 0 2.50
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 1212 024.5012.7090.00 % 18 109 1 0.9010 0 12.9027.5827.50
app/decorators/order_book_decorator.rb 100.00 % 9 5 5 01.0012 025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.40
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb 100.00 % 13 8 8 014.7513.75
app/decorators/paginating_decorator.rb 100.00 % 352 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 91app/controllers/application_controller.rb100.00 % 2 1app/admin/admin_users.rb 40.00 % 27 20 8 12 0.40
app/admin/authors.rb 100.00 % 36 22 22 0 1.95
app/admin/books.rb 100.00 % 77 51 51 0 4.20
app/admin/categories.rb 100.00 % 31 18 18 0 2.17
app/admin/coupons.rb 20.83 % 36 24 5 19 0.21
app/admin/dashboard.rb42.86 % 14 7 3 4 5.86app/controllers/books_controller.rb 100.00 % 28 14 14 0 13.86app/controllers/books_controller.rb 100.00 % 24 12 12 0 13.50
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 %44.44 %18 9 4 5 4.67
app/admin/deliveries.rb 30.00 % 33 20 6 14 0.30
app/admin/orders.rb 18.52 % 39 27 5 22 0.19
app/controllers/application_controller.rb 100.00 % 29 18 18 0 52.06
app/controllers/books_controller.rb 93.75 % 31 16 15 1 14.94
app/controllers/checkouts_controller.rb 47.76 % 125 67 32 35 0.69
app/controllers/coupons_controller.rb 100.00 % 16 9 9 0 3.00
app/controllers/home_controller.rb 100.00 % 12 7 7 0 8.29
app/controllers/order_books_controller.rb 82.86 % 62 35 29 6 1.74
app/controllers/orders_controller.rb 33.33 % 59 33 11 22 0.70
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 80.95 % 43 21 17 4 3.00
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 1212 024.5012.7090.00 % 18 109 1 0.9010 0 12.9027.5827.5027.5012.7090.00 % 18 109 1 0.9010 0 12.9028.4228.4212.7090.00 % 18 109 1 0.9010 0 12.9028.4228.50
app/decorators/delivery_decorator.rb 75.00 % 7 4 3 1 0.75
app/decorators/order_book_decorator.rb 100.00 % 9 5 5 01.0012 025.6712.7090.00 % 18 109 1 0.9010 0 12.902.602.402.602.80
app/decorators/category_decorator.rb 100.00 %3 2 2 0 1.00app/decorators/order_decorator.rb100.00 % 13 8 8 014.7513.7517.7519.2590.00 % 17 10 9 1 15.5078.57 % 25 14 11 3 11.79
app/decorators/paginating_decorator.rb 100.00 % 35552 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 912 20 1.00
app/controllers/books_controller.rb93.75 % 31 16 15 1 13.94100.00 % 28 14 14 0 13.36app/controllers/books_controller.rbapp/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb100.00 % 9 5 5 0 1.401.861.861.861.868 4 0.67app/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb100.00 % 9 5 5 0 1.401.861.861.861.86
app/helpers/application_helper.rb 100.00 %7 4 4 0 5.005 3 3 0 4.67
app/helpers/constants.rb 100.00 % 27 21 21 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/jobs/application_job.rb 100.00 % 7 1 1app/controllers/application_controller.rb 100.00 % 2 1 10 1.00
app/jobs/cart_cleaner.rb 60.00 % 8 5 3 2 0.60
app/models/address.rbapp/controllers/books_controller.rb100.00 % 2412 12 0 13.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/reviews_controller.rb 100.00 % 19 10 10 0 1.30
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 1212 024.5012.7090.00 % 18 109 1 0.9010 0 12.901 0.90
app/decorators/category_decorator.rb 100.00 %3 2 2 07 7 01.0012 0 25.67
app/decorators/paginating_decorator.rb 100.00 % 352 2app/controllers/application_controller.rbapp/decorators/author_decorator.rb100.00 % 7 4 4 0 1.25
app/decorators/book_decorator.rb 90.00 % 18 10 91app/controllers/application_controller.rb 100.00 % 2 1 12 207 7 01.00
app/controllers/books_controller.rb 93.33 % 30 15 1414 0 13.361 14.13app/controllers/books_controller.rbapp/decorators/review_decorator.rb 100.00 % 7 4 45 2 20 1.00
app/decorators/user_decorator.rb100.00 % 9 5 5 0 1.401.861.861.861.868 4 0.67app/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.001.861.86
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.40
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.401.861.861.861.861.861.861.861.861.861.86
app/helpers/application_helper.rb 100.00 % 7 4 4 0 5.00
app/helpers/constants.rb 100.00 % 27 21 210 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/jobs/application_job.rb 100.00 % 7 1 1 0 1.00
app/jobs/cart_cleaner.rb 60.00 % 8 5 3 2 0.60
app/models/address.rb 100.00 % 2412 12 0 13.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 6.14
app/controllers/reviews_controller.rb 100.00 % 17 9 9 0 1.33
app/controllers/users_controller.rb 86.67 % 31 15 13 2 2.93
app/decorators/author_decorator.rb 100.00 % 7 4 4 0 1.50
app/decorators/book_decorator.rb 100.00 % 23 12 12 012.70
app/decorators/category_decorator.rb 100.00 % 3 2 2 07 7 01.0024.50
app/decorators/paginating_decorator.rb 100.00 % 3 2 2 07 7 01.00
app/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.40
app/helpers/application_helper.rb 100.00 % 7 4 4 0 4.00
app/helpers/constants.rb 100.00 % 27 21 21 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.00
app/models/address.rb 100.00 % 247 7 0app/controllers/books_controller.rbapp/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb100.00 % 9 5 5 0 1.401.861.861.861.868 4 0.67app/decorators/review_decorator.rb 100.00 % 7 4 4 0 1.00
app/decorators/user_decorator.rb 100.00 % 9 5 5 0 1.401.861.861.861.861.861.861.861.861.861.861.861.861.861.861.861.86
app/helpers/application_helper.rb 100.00 % 7 4 4 0 5.00
app/helpers/constants.rb 100.00 % 33 26 26 0 1.00
app/interactors/billing_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/shipping_update.rb 87.50 % 14 8 7 1 0.88
app/interactors/user_update.rb 100.00 % 25 13 13 0 3.08
app/jobs/cart_cleaner_job.rb 66.67 % 9 6 4 2 0.67
app/models/address.rb 100.00 % 2412 12 0 13.5013.86
app/controllers/home_controller.rb 100.00 % 12 7 7 0 1.86
app/decorators/author_decorator.rb 100.00 % 7 4 4 01.251.501.25
app/decorators/book_decorator.rb90.00 % 18 10 9 1 0.90100.00 % 18 10 10 0 12.7090.00 % 18 10 9 1 0.90
app/decorators/category_decorator.rb 100.00 %53 2 2 07 7 01.00
app/decorators/paginating_decorator.rb 100.00 % 352 2 07 7 01.00
app/models/admin_user.rbapp/helpers/application_helper.rb100.00 % 6 2 2app/helpers/application_helper.rbapp/models/admin_user.rb100.00 % 62 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 42 2app/helpers/application_helper.rbapp/models/admin_user.rb100.00 % 6100.00 % 6100.00 % 64 4app/helpers/application_helper.rb 100.00 % 32 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 %6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 %6 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 26 4 4app/helpers/application_helper.rb 100.00 % 3 2 2app/helpers/application_helper.rb 100.00 % 6 4 4app/helpers/application_helper.rb 100.00 % 3 2 20 1.00
app/models/application_record.rb 100.00 % 3 2 2 0 1.00
app/models/author.rb 100.00 %6 4 47 5 56 4 47 5 57 5 57 5 57 5 57 5 56 4 46 4 46 4 40 1.00
app/models/authors_book.rb 100.00 % 6 4 4 0 1.00
app/models/billing.rb 100.00 % 2 1 16 4 4app/models/authors_book.rb 100.00 % 6 4 40 1.00
app/models/billing.rb 100.00 % 2 1 1 0 1.00
app/models/book.rb 100.00 %17app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 915 8 8app/models/book.rb 100.00 % 13 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 417app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 919 10 10app/models/book.rb 100.00 %15 8 8app/models/book.rb 100.00 % 13 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 417app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 13app/models/book.rb 100.00 % 139 919 10 10app/models/book.rb 100.00 % 13 9 919 10 10app/models/book.rb 100.00 % 15 8 80 1.00
app/models/books_category.rb 100.00 % 6 4 417 9 919 10 10app/models/book.rb 100.00 % 13 9 9app/models/book.rb 100.00 % 13 9 917 9 90 1.00
app/models/books_category.rb 100.00 % 6 4 4 0 1.00
app/models/category.rb 100.00 % 6 4 4 0 1.00
app/models/user.rbapp/models/review.rb100.00 % 16 7 7app/models/user.rbapp/models/review.rb100.00 %8 2 2100.00 % 16app/models/user.rbapp/models/review.rb100.00 % 16app/models/user.rb 100.00 % 8app/models/coupon.rb 100.00 % 32 2 0 1.00app/models/user.rb 100.00 % 8 2 2
app/models/order.rb 100.00 % 6 4 416 7 70 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 16app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.50
app/models/user.rbapp/models/review.rb100.00 % 16app/models/coupon.rb 100.00 % 3app/models/coupon.rb 100.00 % 3app/models/user.rb 100.00 % 8app/models/user.rb 100.00 % 8app/models/user.rb 100.00 % 8app/models/user.rb 100.00 % 8app/models/coupon.rb 100.00 % 3app/models/coupon.rb 100.00 % 32 2 0 1.00app/models/user.rb 100.00 % 8 2 2
app/queries/book_query.rb 87.50 % 15 8 7 17.257.507.257.507.257.507.257.50app/models/credit_card.rb 100.00 % 12 6 6 0 1.00
app/models/delivery.rb 100.00 % 5 3 3 0 1.00
app/queries/book_query.rb 87.50 % 15 8 7 17.257.507.257.507.257.507.257.50
app/models/order.rb 100.00 % 9 6 6 0 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 16 7 7 0 1.00
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 877 0 1.00app/models/coupon.rb 100.00 % 3app/models/coupon.rb 100.00 % 3app/models/user.rb 100.00 % 8app/models/user.rb 100.00 % 8app/models/user.rb 100.00 % 8app/models/user.rb 100.00 % 8app/models/coupon.rb 100.00 % 32 2 0 1.00app/models/user.rb 100.00 % 8 2 27 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.257.507.257.507.257.507.257.50app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30app/queries/book_query.rb 85.71 % 13 7 6 1 8.14
app/models/user.rb 57.14 % 23 14 8 6 0.57
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/models/order.rb 100.00 % 6 4 4 0 1.00
app/models/order_book.rb 100.00 % 4 3 3 0 1.00
app/models/review.rb 100.00 % 16 7 7 0 1.00
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.50
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 877 0 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.507.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30app/queries/book_query.rb 85.71 % 13 7 6 1 8.14
app/models/user.rb 53.85 % 22 13 7 6 0.54
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.257.25
app/queries/book_query.rb 87.50 % 15 8 7app/models/shipping.rb 100.00 % 2 117.507.50
app/queries/book_query.rb 87.50 % 15 877 0 1.00app/models/user.rb 100.00 % 8 2 2app/models/review.rb 100.00 % 16 7 70 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.507.507.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30app/queries/book_query.rb 85.71 % 13 7 6 1 8.14
app/models/user.rb 53.85 % 22 13 7 6 0.54
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30
app/queries/book_query.rb 87.50 % 15 8770 1.001 7.507 1 7.257.25
app/queries/book_query.rb 87.50 % 15 8 7 17.25app/queries/book_query.rb 85.71 % 13 7 6 1 8.147.507.25app/models/shipping.rb 100.00 % 2 1 1 0 1.007.257.50app/models/shipping.rb 100.00 % 2 1 1 0 1.00
app/models/user.rb 50.00 % 21 12 6 6 0.50
app/queries/book_query.rb 90.00 % 17 10 9 1 9.30app/queries/book_query.rb 85.71 % 13 7 6 1 8.14
app/queries/order_query.rb 36.36 % 19 11 4 7 0.36
app/services/book_service.rb 88.89 % 19 9 8 1 1.56
app/services/checkout_service.rb 50.00 % 7 4 2 2 0.50
app/services/coupon_service.rb 81.82 % 17 11 9 2 1.91
config/application.rb 100.00 % 22 7 7config/application.rb 100.00 % 22 6 6config/application.rb 100.00 % 22 7 76 6config/application.rb 100.00 % 22 6 60 1.00
config/boot.rb 100.00 % 4 3 3 0 1.00
config/environment.rb 100.00 % 5 2 2 0 1.00
config/environments/test.rb 100.00 % 6019 19 0 1.00
config/initializers/active_admin.rb 100.00 % 12 11 1118 1818 1818 1818 1818 1818 1818 180 1.00
config/initializers/application_controller_renderer.rb 100.00 % 8 0 0 0 0.00
config/initializers/assets.rb 100.00 % 14 2 2 0 1.00
config/initializers/backtrace_silencers.rb 100.00 % 8 1 1 0 1.00
config/initializers/content_security_policy.rb 100.00 % 30 0 0 0 0.00
config/initializers/cookies_serializer.rb 100.00 % 5 1 1 0 1.00
config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 %311 13 1320 14 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 2014 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 % 311 13 13config/initializers/devise.rb 100.00 % 20 14 14config/initializers/devise.rb 100.00 % 311 13 1313 130 1.00
config/initializers/filter_parameter_logging.rb 100.00 % 6 1 1 0 1.00
config/initializers/inflections.rb 100.00 % 16 0 0 0 0.00
config/initializers/kaminari.rb 100.00 % 3 2 2 0 1.00
config/initializers/mime_types.rb 100.00 % 4 0 0 0 0.00
config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 3 3 3config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 32 23 3config/initializers/omniauth.rb 100.00 % 3 2 20 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3 0 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3config/initializers/omniauth.rbconfig/initializers/money.rb100.00 % 32 23 3config/initializers/omniauth.rb 100.00 % 3 2 20 1.00
config/initializers/omniauth.rb 100.00 % 8config/initializers/money.rb100.00 % 33 3 0 1.00
config/initializers/omniauth.rb 100.00 % 8config/initializers/money.rb100.00 % 33 3 0 1.00
config/initializers/omniauth.rb 100.00 % 8 3 3 0 1.00
config/initializers/permissions_policy.rb 100.00 % 11 0 0 0 0.00
config/initializers/wrap_parameters.rb 100.00 % 14 2 2 0 1.50
config/routes.rb 100.00 %17 9 95 3 37 4 45 3 317 9 95 3 35 3 37 4 45 3 37 4 417 9 917 9 917 9 95 3 35 3 35 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 431 17 1717 9 917 9 917 9 917 9 95 3 35 3 35 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 431 17 1731 17 175 3 35 3 35 3 37 4 45 3 37 4 45 3 37 4 45 3 37 4 433 18 185 3 35 3 37 4 45 3 37 4 45 3 37 4 417 9 95 3 37 4 431 17 1731 17 1733 18 185 3 35 3 35 3 37 4 45 3 37 4 45 3 37 4 45 3 37 4 45 3 35 3 37 4 45 3 37 4 45 3 37 4 45 3 37 4 433 18 180 1.00
spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 0 1.60spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 01.291.60spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 01.291.60spec/decorators/author_decorator_spec.rb 100.00 % 9 5 5 01.291.60spec/decorators/author_decorator_spec.rb 100.00 % 13 7 7 0 1.29
spec/decorators/book_decorator_spec.rb 100.00 % 36 15 15 0 1.50
spec/decorators/book_decorator_spec.rb 100.00 % 36 15 15 0 1.73
spec/factories/addresses.rb 100.00 % 4 2 2 0 1.001.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.731.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.46spec/decorators/book_decorator_spec.rb 100.00 % 29 13 13 01.501.461.73
spec/factories/admin_users.rbspec/factories/authors.rbspec/factories/addresses.rb 100.00 % 4 2 2 0 1.00
spec/factories/admin_users.rbspec/factories/authors.rb100.00 % 6 4 4 08.007.001.008.007.001.008.007.001.008.00
spec/factories/authors.rb 80.00 % 18 108 2 2.501.00spec/factories/authors.rb 100.00 % 6 4 4 0 1.007 3 0.708 2 2.50
spec/factories/authors_books.rb 100.00 % 6 4 4 0 1.00
spec/factories/billings.rb 100.00 % 10 8 8 01.002.5669.562.5668.002.5668.002.5668.002.5669.561.001.001.00spec/factories/books.rb 100.00 % 11 9 9 02.561.00
spec/factories/books.rb 80.95 % 35 2117 446.3845.52spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5615 6 0.7117 446.38spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.6217 4 45.52spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5615 6 0.7117 446.3868.0068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.6268.0068.002.5668.002.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.6217 4 45.5268.0068.002.5668.002.5668.002.5668.002.5669.5668.002.5669.56spec/factories/books.rb 80.95 % 35 2115 6 0.7117 4 46.38spec/factories/books.rb 100.00 % 11 9 9 068.002.5669.562.5668.002.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5649.6268.0068.002.5668.002.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.5668.0068.002.5668.002.5668.002.5668.002.5669.5668.002.5669.5668.002.5669.56
spec/factories/books_categories.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rbspec/factories/books_category.rb100.00 % 6 4 4 0 1.00
spec/factories/categories.rb 100.00 % 5 3 3 04.671.001.003.334.674.673.333.333.331.004.674.671.004.674.673.333.333.333.333.334.674.673.333.331.004.674.673.333.333.333.333.334.674.673.333.333.333.333.334.674.673.333.331.004.674.673.333.333.333.333.334.674.673.333.333.333.333.334.673.333.333.333.334.67
spec/factories/users.rbspec/factories/reviews.rbspec/factories/users.rbspec/factories/coupons.rb 100.00 % 8 6 6 0 2.50
spec/factories/credit_cards.rb 100.00 % 9 7 7 0 1.00
spec/factories/deliveries.rb 100.00 % 7 5 5 0 3.40
spec/factories/order_books.rb 100.00 % 7 5 5 0 1.80
spec/factories/orders.rb 80.00 % 18 10 8 2 1.50
spec/factories/reviews.rb100.00 % 7 5 5 0 1.00
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.381.00
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.0013.4015.20
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.333.333.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.333.333.33
spec/feature/book_spec.rb100.00 %7 5 5spec/factories/users.rbspec/factories/coupons.rb 100.00 % 8 6 6 0 2.50202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/cart_spec.rb 100.00 % 50 26 26 0 1.62
spec/feature/checkout_spec.rb 100.00 % 59 34 34 0 1.26
spec/feature/coupon_spec.rb 100.00 % 47 28 28 02.17105 105 0 2.372.25
spec/factories/order_books.rb 100.00 %7 5 5 0 1.8096 49 49 0 1.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/address_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.05
spec/factories/orders.rb 77.78 % 17 9 7 2 1.56
spec/factories/reviews.rb100.00 %4 2 27 5 5spec/factories/users.rbspec/factories/coupons.rb 100.00 % 8 6 6 0 2.50
spec/factories/order_books.rb 100.00 % 7 5 5 0 1.80
spec/factories/orders.rb 77.78 % 17 9 7 2 1.56
spec/factories/reviews.rb100.00 %4 2 27 5 5spec/factories/users.rbspec/factories/reviews.rb100.00 %4 2 27 5 50 1.00
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.69
spec/models/books_category_spec.rb 100.00 %13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.381.00
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.0013.4015.20
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.333.333.333.333.333.33
spec/factories/shippings.rb 100.00 % 10 8 8 0 1.00
spec/factories/users.rb 100.00 % 7 5 5 011.00
spec/feature/admin/author_spec.rb 100.00 % 57 31 31 0 1.48
spec/feature/admin/book_spec.rb 100.00 %61 32 32 0 1.4183 43 43 0 1.56
spec/feature/admin/category_spec.rb 100.00 % 48 25 25 0 1.56
spec/feature/billing_spec.rb 73.08 % 42 26 19 7 0.773.333.333.333.33
spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.333.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37spec/factories/users.rb 100.00 % 4 2 2 0 1.003.333.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/cart_spec.rb 100.00 % 56 29 29 0 1.45
spec/feature/checkout_spec.rb 100.00 % 62 36 36 0 1.25
spec/feature/coupon_spec.rb 100.00 % 50 30 30 0 2.17spec/factories/users.rb 100.00 % 4 2 2 0 1.003.33
spec/feature/book_spec.rb 100.00 % 202spec/feature/book_spec.rb 100.00 % 202104 104 0 2.38105 105 0 2.37
spec/feature/cart_spec.rb 96.55 % 56 29 28 1 1.41
spec/feature/coupon_spec.rb 100.00 % 50 30 30 0 2.17
spec/feature/home_spec.rb 100.00 %96 49 49 0 1.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.0596 49 49 096 49 49 01.12
spec/feature/login_spec.rb 100.00 % 35 19 19 0 1.16
spec/feature/new_password_spec.rb 100.00 % 24 13 13 0 1.15
spec/feature/registration_spec.rb 100.00 % 51 29 29 0 1.14
spec/feature/review_spec.rb 100.00 %49 30 30 0 1.6746 28 28 0 1.71
spec/feature/settings_spec.rb 100.00 % 62 34 34 0 1.26
spec/feature/shipping_spec.rb 73.08 % 42 26 19 7 0.77
spec/feature/user_spec.rb 100.00 % 76 42 42 0 1.10
spec/models/admin_user_spec.rb 100.00 % 8 5 5 0 1.4039 20 20 0 1.05
spec/models/author_spec.rb 100.00 %13 8 8 0 1.50
spec/models/authors_book_spec.rb 100.00 %13 8 8 0 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/order_spec.rb 100.00 % 10 6 6 0 1.33
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 913 8 80 1.50
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.531.00
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.53spec/models/authors_book_spec.rb 100.00 %13 8 8 0 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/order_spec.rb 100.00 % 10 6 6 0 1.33
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 913 8 815 9 90 1.44
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.53
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.001.53spec/models/authors_book_spec.rb 100.00 % 15 9 913 8 80 1.50
spec/models/billing_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/shipping_spec.rb 100.00 % 27 20 20 0 1.75
spec/models/user_spec.rb 100.00 %15 9 9 0 1.44
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.53
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.001.53spec/models/authors_book_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/book_spec.rb 100.00 % 23 16 16 0 1.75
spec/models/books_category_spec.rb 100.00 % 13 8 8 0 1.50
spec/models/category_spec.rb 100.00 % 12 7 7 0 1.43
spec/models/credit_card_spec.rb 100.00 % 19 13 13 0 1.69
spec/models/delivery_spec.rb 100.00 % 11 6 6 0 1.33
spec/models/order_spec.rb 100.00 % 10 6 6 0 1.33
spec/models/review_spec.rb 100.00 % 20 14 14 0 1.64
spec/models/user_spec.rb 100.00 %15 9 913 8 815 9 90 1.44
spec/queryes/book_query_spec.rb 100.00 % 77 45 45 01.381.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.53
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.53
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.00
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.001.53spec/models/authors_book_spec.rb 100.00 %15 9 9 0 1.44
spec/models/book_spec.rbspec/queryes/book_query_spec.rb100.00 % 23 16 16 01.53spec/models/authors_book_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/book_spec.rb 100.00 % 23 16 16 01.69
spec/models/books_category_spec.rb 100.00 % 15 9 9 0 1.44
spec/models/category_spec.rb 100.00 % 14 8 8 0 1.381.001.001.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.001.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.001.00
spec/models/user_spec.rb 100.00 % 5 3 3 0 1.00
spec/rails_helper.rb 87.50 % 23 16 14 2 0.881.00
spec/support/configs/capybara.rb100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %100.00 %36.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 19 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 291919 0 1.007 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 19 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29100.00 % 30100.00 % 30100.00 % 3019 19 0 1.00100.00 % 29 19 19 0 1.00100.00 %293036.84 % 291919 0 1.007 12 0.377 12 0.377 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 %293036.84 % 291919 0 1.00100.00 %293036.84 % 291919 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 %293036.84 % 291919 0 1.007 12 0.377 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 %293036.84 % 291919 0 1.00100.00 % 29 19 19 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.0036.84 % 29 19 7 12 0.37100.00 %293036.84 % 291919 0 1.007 12 0.377 12 0.377 12 0.3719 0 1.0036.84 % 29 19 7 12 0.37100.00 % 30 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 %293036.84 % 2919100.00 % 29 1919 0 1.0036.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.00100.00 % 29 19 19 0 1.007 12 0.3736.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37100.00 % 29 19 19 0 1.007 12 0.37100.00 % 29 19 19 0 1.0036.84 % 29 19 7 12 0.3736.84 % 29 19 7 12 0.37
spec/support/configs/shoulda_matcher.rb 100.00 %89889999988999999889999998899999985 5 0 1.00
spec/support/configs/sidekiq.rb 100.00 % 3 2 2 0 1.00
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)
======= ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix)
======= ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)

app/admin/admin_users.rb

40.0% lines covered

20 relevant lines. 8 lines covered and 12 lines missed.
    
  1. 1 ActiveAdmin.register AdminUser do
  2. 1 permit_params :email, :password, :password_confirmation
  3. 1 index do
  4. selectable_column
  5. id_column
  6. column :email
  7. column :current_sign_in_at
  8. column :sign_in_count
  9. column :created_at
  10. actions
  11. end
  12. 1 filter :email
  13. 1 filter :current_sign_in_at
  14. 1 filter :sign_in_count
  15. 1 filter :created_at
  16. 1 form do |f|
  17. f.inputs do
  18. f.input :email
  19. f.input :password
  20. f.input :password_confirmation
  21. end
  22. f.actions
  23. end
  24. end

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Author do
  2. 1 config.filters = true
  3. 1 permit_params :first_name, :last_name
  4. 1 filter :books, collection: Book.all
  5. 1 filter :first_name
  6. 1 filter :last_name
  7. 1 index do
  8. 3 selectable_column
  9. 3 column :first_name
  10. 3 column :last_name
  11. 3 actions
  12. end
  13. 1 show do
  14. 3 attributes_table do
  15. 3 row :first_name
  16. 3 row :last_name
  17. 3 row :books
  18. end
  19. end
  20. 1 form do |f|
  21. 2 f.inputs do
  22. 2 f.input :first_name
  23. 2 f.input :last_name
  24. 2 f.input :books, as: :select, collection: Book.all
  25. end
  26. 2 f.actions
  27. end
  28. end

app/admin/books.rb

100.0% lines covered

51 relevant lines. 51 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Book do
  2. 1 permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
  3. author_ids: [], category_ids: [], images: []
  4. 1 decorate_with BookDecorator
  5. 1 filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
  6. 1 filter :categories
  7. 1 filter :title
  8. 1 filter :year_of_publication
  9. 1 index do
  10. 6 selectable_column
  11. 6 column :categories, &:categories_names
  12. 6 column :title
  13. 6 column :authors, &:authors_names
  14. 6 column :description
  15. 6 column :price, &:price
  16. 6 column :quantity
  17. 6 actions
  18. end
  19. 1 show do
  20. 5 attributes_table do
  21. 5 row :authors, &:authors_names
  22. 5 row :categories, &:categories_names
  23. 5 row :year_of_publication
  24. 5 row :description
  25. 5 row :materials
  26. 5 row :dimensions
  27. 5 row :price, &:price
  28. 5 row :created_at
  29. 5 row :updated_at
  30. end
  31. 5 panel :images do
  32. 5 table do
  33. 5 book.images.each do |image|
  34. 2 span image_tag image.variant(resize_to_limit: [100, 100])
  35. end
  36. end
  37. end
  38. end
  39. 1 form do |f|
  40. 6 f.inputs do
  41. 6 f.input :title
  42. 6 f.input :description
  43. 6 f.input :year_of_publication
  44. 6 f.input :price_cents
  45. 6 f.input :materials
  46. 6 f.input :dimensions
  47. 6 f.input :quantity
  48. 6 f.input :categories, as: :select, collection: Category.all
  49. 6 f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  50. 6 f.input :images, as: :file, input_html: { multiple: true }
  51. end
  52. 6 panel :images do
  53. 6 f.object.images.each do |image|
  54. 1 span image_tag image.variant(resize_to_limit: [100, 100])
  55. 1 span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
  56. data: { confirm: "Delete #{image.filename}?" })
  57. end
  58. end
  59. 6 f.actions
  60. end
  61. 1 member_action :delete_image, method: :delete do
  62. 1 ActiveStorage::Attachment.find(params[:id]).purge_later
  63. 1 redirect_back(fallback_location: edit_admin_book_path)
  64. end
  65. end

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Category do
  2. 1 permit_params :name, book_ids: []
  3. 1 filter :books, collection: Book.all
  4. 1 filter :name
  5. 1 index do
  6. 4 selectable_column
  7. 4 column :name
  8. 4 actions
  9. end
  10. 1 show do
  11. 3 attributes_table do
  12. 3 row :name
  13. 3 row :created_at
  14. 3 row :updated_at
  15. end
  16. end
  17. 1 form do |f|
  18. 2 f.inputs do
  19. 2 f.input :name
  20. 2 f.input :books, as: :select, collection: Book.all
  21. end
  22. 2 f.actions
  23. end
  24. end

app/admin/coupons.rb

20.83% lines covered

24 relevant lines. 5 lines covered and 19 lines missed.
    
  1. 1 ActiveAdmin.register Coupon do
  2. 1 permit_params :code, :is_active, :active_till_date, :discount, :order_id
  3. 1 index do
  4. selectable_column
  5. column :code
  6. column :is_active
  7. column :active_till_date
  8. column :discount
  9. actions
  10. end
  11. 1 show do
  12. attributes_table do
  13. row :code
  14. row :is_active
  15. row :active_till_date
  16. row :discount
  17. row :order
  18. end
  19. end
  20. 1 form do |f|
  21. f.inputs do
  22. f.input :code
  23. f.input :is_active
  24. f.input :active_till_date
  25. f.input :discount
  26. f.input :order
  27. end
  28. f.actions
  29. end
  30. end

app/admin/dashboard.rb

44.44% lines covered

9 relevant lines. 4 lines covered and 5 lines missed.
    
  1. # frozen_string_literal: true
  2. 1 ActiveAdmin.register_page 'Dashboard' do
  3. 39 menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
  4. 1 action_item only: :show do
  5. link_to 'SideKiq View', sidekiq_web_path
  6. end
  7. 1 content title: proc { I18n.t('active_admin.dashboard') } do
  8. div class: 'blank_slate_container', id: 'dashboard_default_message' do
  9. span class: 'blank_slate' do
  10. span I18n.t('active_admin.dashboard_welcome.welcome')
  11. small I18n.t('active_admin.dashboard_welcome.call_to_action')
  12. end
  13. end
  14. end
  15. end

app/admin/deliveries.rb

30.0% lines covered

20 relevant lines. 6 lines covered and 14 lines missed.
    
  1. 1 ActiveAdmin.register Delivery do
  2. 1 permit_params :price_cents, :delivery_method, :delivery_day
  3. 1 decorate_with DeliveryDecorator
  4. 1 index do
  5. selectable_column
  6. column :price_cents, &:price
  7. column :delivery_method
  8. column :delivery_day
  9. actions
  10. end
  11. 1 show do
  12. attributes_table do
  13. row :price_cents, &:price
  14. row :delivery_method
  15. row :delivery_day
  16. end
  17. end
  18. 1 form do |f|
  19. f.inputs do
  20. f.input :price_cents
  21. f.input :delivery_method
  22. f.input :delivery_day
  23. end
  24. f.actions
  25. end
  26. end

app/admin/orders.rb

18.52% lines covered

27 relevant lines. 5 lines covered and 22 lines missed.
    
  1. 1 ActiveAdmin.register Order do
  2. 1 permit_params :user_id, :coupon_id, :address_id, :total_price, :status, :last_action
  3. 1 index do
  4. selectable_column
  5. column :user
  6. column :coupon
  7. column :total_price
  8. column :status
  9. column :updated_at
  10. actions
  11. end
  12. 1 show do
  13. attributes_table do
  14. row :user
  15. row :coupon
  16. row :total_price
  17. row :status
  18. row :delivery_id
  19. row :updated_at
  20. end
  21. end
  22. 1 form do |f|
  23. f.inputs do
  24. f.input :user_id
  25. f.input :coupon_id
  26. f.input :total_price
  27. f.input :status, as: :select, collection: %i[confirmed delivered canceled]
  28. f.input :delivery_id
  29. f.input :books
  30. end
  31. f.actions
  32. end
  33. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 3dc272d (Featire specs)

app/admin/admin_users.rb

40.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 20 relevant lines. 8 lines covered and 12 lines missed. ======= ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) 10 relevant lines. 10 lines covered and ======= 1 relevant lines. 1 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 1 relevant lines. 1 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 1 relevant lines. 1 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 1 relevant lines. 1 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 14 relevant lines. 14 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= 18 relevant lines. 18 lines covered and >>>>>>> aa4fb26 (Add sort orders) 0 lines missed. >>>>>>> 1a9aba9 (Fix)
    
  1. 1 <<<<<<< HEAD ActiveAdmin.register AdminUser do ======= class ApplicationController < ActionController::Base
  2. 1 before_action :user_or_guest_have_order
  3. 1 after_action :save_previous_path
  4. 1 private
  5. 1 def user_or_guest_have_order
  6. 185 if current_user && (session[:order_id].nil? || Order.where(id: session[:order_id]).empty?)
  7. 15 create_order_for_user
  8. 170 elsif session[:order_id].nil? || Order.where(id: session[:order_id]).empty?
  9. 55 create_order_for_guest
  10. end
  11. end
  12. 1 def create_order_for_user
  13. 15 session[:order_id] = Order.find_or_create_by(user_id: current_user.id, status: :initialized).id
  14. 15 CartCleanerJob.perform_in(3.days, session[:order_id])
  15. end
  16. 1 def create_order_for_guest
  17. 55 session[:order_id] = Order.create.id
  18. 55 CartCleanerJob.perform_in(3.days, session[:order_id])
  19. end
  20. 1 def save_previous_path
  21. 182 previous_path = request.path
  22. 182 session[:previous_path] = previous_path unless previous_path == request.url
  23. end
  24. end
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix)

app/controllers/books_controller.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 93.33% ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) 93.75% >>>>>>> c4adab0 (Featire specs) ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 08edf50 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 7a02bbe (Featire specs) ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 93.75% >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 93.75% >>>>>>> 7c4ea7f (Fix) ======= 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= 93.75% >>>>>>> 8f1bc14 (Fix) ======= 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) ======= 93.75% >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 0 lines missed. ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 15 relevant lines. 14 lines covered and ======= ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) 16 relevant lines. 15 lines covered and >>>>>>> 864f339 (Featire specs) 1 lines missed. <<<<<<< HEAD <<<<<<< HEAD ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 9dc109d (Featire specs) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 65f3409 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
    
  1. 1 class BooksController < ApplicationController >>>>>>> 3dc272d (Featire specs)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD permit_params :email, :password, :password_confirmation ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> 3dc272d (Featire specs)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD index do ======= ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) def index >>>>>>> 3dc272d (Featire specs)
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  5. ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  6. 24 <<<<<<< HEAD ======= =======
  7. ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  8. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  9. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  10. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  11. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs)
  12. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  13. 25 =======
  14. 25 >>>>>>> 9620751 (Featire specs) =======
  15. 25 >>>>>>> 9dc109d (Featire specs) =======
  16. 25 >>>>>>> 65f3409 (Featire specs) =======
  17. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  18. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  19. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  20. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= =======
  21. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= =======
  22. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  23. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  24. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  25. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= =======
  26. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  27. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  28. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= =======
  29. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) selectable_column
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  31. ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  32. 24 <<<<<<< HEAD ======= =======
  33. ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  34. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  35. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  36. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  37. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs)
  38. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  39. 25 =======
  40. 25 >>>>>>> 9620751 (Featire specs) =======
  41. 25 >>>>>>> 9dc109d (Featire specs) =======
  42. 25 >>>>>>> 65f3409 (Featire specs) =======
  43. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  44. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  45. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  46. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= =======
  47. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= =======
  48. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  49. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  50. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  51. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= =======
  52. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  53. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  54. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= =======
  55. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) id_column
  56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  57. ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  58. 24 <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages)
  59. 24 =======
  60. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  61. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= =======
  62. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs)
  63. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  64. 25 =======
  65. 25 >>>>>>> 9620751 (Featire specs) =======
  66. 25 >>>>>>> 9dc109d (Featire specs) =======
  67. 25 >>>>>>> 65f3409 (Featire specs) =======
  68. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  69. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  70. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  71. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  72. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= =======
  73. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  74. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= =======
  75. 25 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= =======
  76. 25 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= =======
  77. 25 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD column :email ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> eaef86a (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  78. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  79. ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) >>>>>>> 5ce1a6d (Featire specs)
  80. >>>>>>> 1577aeb (Rebased) =======
  81. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  82. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  83. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  84. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  85. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  86. >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  87. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) =======
  88. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  89. >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  90. >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD column :current_sign_in_at ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) per_page: Constants::PAGINATION_PER_PAGE) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  91. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  92. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= def index
  93. 25 @books_count = Book.count
  94. 25 @categories = Category.all
  95. 25 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  96. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) =======
  97. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  98. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a624084 (Add login registration pages) =======
  99. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= =======
  100. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= =======
  101. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) sorted_books = BookQuery.query(params).paginate(page: params[:page],
  102. per_page: PAGINATION_PER_PAGE) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix)
  103. <<<<<<< HEAD
  104. column :sign_in_count
  105. column :created_at
  106. actions
  107. end
  108. =======
  109. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  110. >>>>>>> 752f0c0 (Featire specs) =======
  111. >>>>>>> 4e81ea2 (Featire specs) =======
  112. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix)
  113. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  114. 1 ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  115. 24 <<<<<<< HEAD ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  116. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  117. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
  118. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  119. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) <<<<<<< HEAD filter :email
  120. 1 filter :current_sign_in_at
  121. 1 filter :sign_in_count
  122. 1 filter :created_at
  123. 1 form do |f|
  124. f.inputs do
  125. f.input :email
  126. f.input :password
  127. f.input :password_confirmation
  128. end
  129. f.actions
  130. end
  131. end

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Author do
  2. 1 config.filters = true
  3. 1 permit_params :first_name, :last_name
  4. 1 filter :books, collection: Book.all
  5. 1 filter :first_name
  6. 1 filter :last_name
  7. 1 index do
  8. 3 selectable_column ======= <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  9. <<<<<<< HEAD
  10. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  11. =======
  12. >>>>>>> 752f0c0 (Featire specs) =======
  13. >>>>>>> 4e81ea2 (Featire specs) =======
  14. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  15. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  16. <<<<<<< HEAD
  17. 3 ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  18. 24 <<<<<<< HEAD ======= =======
  19. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  20. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
  21. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= =======
  22. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= =======
  23. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 65f3409 (Featire specs) =======
  24. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  25. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  26. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= <<<<<<< HEAD =======
  27. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  28. 25 >>>>>>> 730a8ca (Add login registration pages) =======
  29. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a624084 (Add login registration pages) =======
  30. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  31. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= =======
  32. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= =======
  33. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books)
  34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  35. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  36. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  37. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  38. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  39. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  40. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  41. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= =======
  42. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= =======
  43. 25 >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  44. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  45. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= =======
  46. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= =======
  47. 25 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) column :first_name
  48. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  49. 3 ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs)
  50. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  51. 24 <<<<<<< HEAD ======= =======
  52. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  53. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  54. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  55. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= =======
  56. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs)
  57. 25 =======
  58. 25 >>>>>>> 9620751 (Featire specs) =======
  59. 25 >>>>>>> 9dc109d (Featire specs) =======
  60. 25 >>>>>>> 65f3409 (Featire specs) =======
  61. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  62. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  63. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  64. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  65. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  66. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  67. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  68. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= =======
  69. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  70. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  71. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= =======
  72. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= =======
  73. 25 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= =======
  74. 25 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= =======
  75. 25 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) column :last_name
  76. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  77. ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs)
  78. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  79. 24 <<<<<<< HEAD ======= =======
  80. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  81. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  82. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  83. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= =======
  84. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs)
  85. 25 =======
  86. 25 >>>>>>> 9620751 (Featire specs) =======
  87. 25 >>>>>>> 9dc109d (Featire specs) =======
  88. 25 >>>>>>> 65f3409 (Featire specs) =======
  89. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  90. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  91. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  92. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  93. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  94. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  95. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  96. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= =======
  97. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  98. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  99. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= =======
  100. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 60943cc (Add login registration pages) ======= =======
  101. 25 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= =======
  102. 25 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= =======
  103. 25 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  104. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  105. 3 ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD
  106. ======= ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  107. >>>>>>> 5a0bcc7 (Featire specs) =======
  108. >>>>>>> 95ebdc2 (Featire specs) =======
  109. >>>>>>> e54ceb0 (Featire specs) =======
  110. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  111. >>>>>>> 94841b5 (Featire specs) =======
  112. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  113. >>>>>>> 3b03895 (Featire specs) =======
  114. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  115. >>>>>>> e54deeb (Featire specs) =======
  116. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  117. >>>>>>> 9c0d812 (Featire specs) =======
  118. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  119. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  120. =======
  121. >>>>>>> 752f0c0 (Featire specs) =======
  122. >>>>>>> 4e81ea2 (Featire specs) =======
  123. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  124. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  125. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs)
  126. =======
  127. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  128. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  129. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  130. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  131. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  132. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  133. >>>>>>> a5d032d (Fix) =======
  134. =======
  135. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  136. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  137. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  138. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  139. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  140. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  141. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  142. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  143. >>>>>>> 7c4ea7f (Fix) =======
  144. =======
  145. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= =======
  146. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= =======
  147. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= =======
  148. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) ======= =======
  149. >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) =======
  150. >>>>>>> 8f1bc14 (Fix) 1 >>>>>>> 3dc272d (Featire specs) actions
  151. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  152. ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix)
  153. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  154. >>>>>>> 94841b5 (Featire specs) =======
  155. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  156. >>>>>>> 3b03895 (Featire specs) =======
  157. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  158. >>>>>>> e54deeb (Featire specs) =======
  159. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  160. >>>>>>> 9c0d812 (Featire specs) =======
  161. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  162. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  163. =======
  164. >>>>>>> 752f0c0 (Featire specs) =======
  165. >>>>>>> 4e81ea2 (Featire specs) =======
  166. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  167. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  168. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  169. =======
  170. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  171. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  172. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  173. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  174. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  175. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  176. >>>>>>> a5d032d (Fix) =======
  177. =======
  178. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  179. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  180. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  181. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  182. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  183. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  184. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  185. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  186. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD end ======= entries: render_to_string(partial: 'books/index/books', formats: [:html]), >>>>>>> 1a9aba9 (Fix)
  187. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  188. =======
  189. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  190. >>>>>>> 94841b5 (Featire specs) =======
  191. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  192. >>>>>>> 3b03895 (Featire specs) =======
  193. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  194. >>>>>>> e54deeb (Featire specs) =======
  195. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  196. >>>>>>> 9c0d812 (Featire specs) =======
  197. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  198. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  199. =======
  200. >>>>>>> 752f0c0 (Featire specs) =======
  201. >>>>>>> 4e81ea2 (Featire specs) =======
  202. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  203. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  204. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  205. =======
  206. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  207. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  208. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  209. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  210. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  211. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  212. >>>>>>> a5d032d (Fix) =======
  213. =======
  214. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  215. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  216. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  217. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  218. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  219. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  220. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  221. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  222. >>>>>>> 7c4ea7f (Fix)
  223. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  224. 1 show do
  225. 3 attributes_table do
  226. 3 row :first_name
  227. 3 row :last_name
  228. 3 row :books
  229. ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) <<<<<<< HEAD
  230. =======
  231. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  232. >>>>>>> 94841b5 (Featire specs) =======
  233. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  234. >>>>>>> 3b03895 (Featire specs) =======
  235. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  236. >>>>>>> e54deeb (Featire specs) =======
  237. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  238. >>>>>>> 9c0d812 (Featire specs) =======
  239. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  240. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  241. =======
  242. >>>>>>> 752f0c0 (Featire specs) =======
  243. >>>>>>> 4e81ea2 (Featire specs) =======
  244. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
  245. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  246. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  247. =======
  248. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= =======
  249. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  250. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= =======
  251. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= =======
  252. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= =======
  253. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  254. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= =======
  255. =======
  256. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
  257. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
  258. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
  259. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= =======
  260. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= =======
  261. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= =======
  262. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  263. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  264. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) end
  265. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  266. end
  267. 1 form do |f|
  268. 2 f.inputs do
  269. 2 f.input :first_name
  270. 2 f.input :last_name
  271. 2 f.input :books, as: :select, collection: Book.all
  272. end
  273. 2 f.actions
  274. end
  275. end

app/admin/books.rb

100.0% lines covered

51 relevant lines. 51 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Book do
  2. 1 permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
  3. author_ids: [], category_ids: [], images: []
  4. 1 decorate_with BookDecorator
  5. 1 filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
  6. 1 filter :categories
  7. 1 filter :title
  8. 1 filter :year_of_publication
  9. 1 index do
  10. 6 selectable_column
  11. 6 column :categories, &:categories_names
  12. 6 column :title
  13. 6 column :authors, &:authors_names
  14. 6 column :description
  15. 6 column :price, &:price
  16. 6 column :quantity
  17. 6 actions
  18. end
  19. 1 show do
  20. 5 attributes_table do
  21. 5 row :authors, &:authors_names
  22. 5 row :categories, &:categories_names
  23. 5 row :year_of_publication
  24. 5 row :description
  25. 5 row :materials
  26. 5 row :dimensions
  27. 5 row :price, &:price
  28. 5 row :created_at
  29. 5 row :updated_at
  30. end
  31. 5 panel :images do
  32. 5 table do
  33. 5 book.images.each do |image|
  34. 2 span image_tag image.variant(resize_to_limit: [100, 100])
  35. end
  36. ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) <<<<<<< HEAD
  37. =======
  38. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  39. >>>>>>> 94841b5 (Featire specs) =======
  40. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  41. >>>>>>> 3b03895 (Featire specs) =======
  42. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  43. >>>>>>> e54deeb (Featire specs) =======
  44. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  45. >>>>>>> 9c0d812 (Featire specs) =======
  46. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  47. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  48. =======
  49. >>>>>>> 752f0c0 (Featire specs) =======
  50. >>>>>>> 4e81ea2 (Featire specs) =======
  51. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
  52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  53. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  54. =======
  55. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= =======
  56. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  57. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= =======
  58. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= =======
  59. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= =======
  60. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  61. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= =======
  62. =======
  63. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
  64. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
  65. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
  66. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= =======
  67. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= =======
  68. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= =======
  69. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  70. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  71. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) end
  72. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  73. end
  74. end
  75. 1 form do |f|
  76. 6 f.inputs do
  77. 6 f.input :title
  78. 6 f.input :description
  79. 6 f.input :year_of_publication
  80. 6 f.input :price_cents
  81. 6 f.input :materials
  82. 6 f.input :dimensions
  83. 6 f.input :quantity
  84. 6 f.input :categories, as: :select, collection: Category.all
  85. 6 f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  86. 6 f.input :images, as: :file, input_html: { multiple: true }
  87. end
  88. 6 panel :images do
  89. 6 f.object.images.each do |image|
  90. 1 span image_tag image.variant(resize_to_limit: [100, 100])
  91. 1 span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
  92. data: { confirm: "Delete #{image.filename}?" })
  93. end
  94. end
  95. 6 f.actions
  96. end
  97. 1 member_action :delete_image, method: :delete do
  98. 1 ActiveStorage::Attachment.find(params[:id]).purge_later
  99. 1 redirect_back(fallback_location: edit_admin_book_path)
  100. end
  101. end

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Category do
  2. 1 permit_params :name, book_ids: []
  3. 1 filter :books, collection: Book.all
  4. 1 filter :name
  5. 1 index do
  6. 4 selectable_column
  7. 4 column :name
  8. 4 actions
  9. end
  10. 1 show do
  11. 3 attributes_table do
  12. 3 row :name
  13. 3 row :created_at
  14. 3 row :updated_at
  15. ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix)
  16. =======
  17. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  18. >>>>>>> 94841b5 (Featire specs) =======
  19. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  20. >>>>>>> 3b03895 (Featire specs) =======
  21. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  22. >>>>>>> e54deeb (Featire specs) =======
  23. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  24. >>>>>>> 9c0d812 (Featire specs) =======
  25. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  26. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  27. =======
  28. >>>>>>> 752f0c0 (Featire specs) =======
  29. >>>>>>> 4e81ea2 (Featire specs) =======
  30. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  31. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  32. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  33. =======
  34. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  35. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  36. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  38. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  40. >>>>>>> a5d032d (Fix) =======
  41. =======
  42. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  43. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  44. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  45. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  46. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  47. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  48. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  49. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  50. >>>>>>> 7c4ea7f (Fix) end
  51. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  52. =======
  53. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  54. >>>>>>> 94841b5 (Featire specs) =======
  55. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  56. >>>>>>> 3b03895 (Featire specs) =======
  57. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  58. >>>>>>> e54deeb (Featire specs) =======
  59. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  60. >>>>>>> 9c0d812 (Featire specs) =======
  61. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  62. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  63. =======
  64. >>>>>>> 752f0c0 (Featire specs) =======
  65. >>>>>>> 4e81ea2 (Featire specs) =======
  66. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  68. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  69. =======
  70. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  71. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  72. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  73. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  74. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  75. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  76. >>>>>>> a5d032d (Fix) =======
  77. =======
  78. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  79. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  80. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  81. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  82. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  83. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  84. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  85. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  86. >>>>>>> 7c4ea7f (Fix) end
  87. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  88. =======
  89. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  90. >>>>>>> 94841b5 (Featire specs) =======
  91. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  92. >>>>>>> 3b03895 (Featire specs) =======
  93. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  94. >>>>>>> e54deeb (Featire specs) =======
  95. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  96. >>>>>>> 9c0d812 (Featire specs) =======
  97. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  98. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  99. =======
  100. >>>>>>> 752f0c0 (Featire specs) =======
  101. >>>>>>> 4e81ea2 (Featire specs) =======
  102. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  103. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  104. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  105. =======
  106. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  107. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  108. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  109. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  110. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  111. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  112. >>>>>>> a5d032d (Fix) =======
  113. =======
  114. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  115. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  116. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  117. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  118. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  119. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  120. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  121. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  122. >>>>>>> 7c4ea7f (Fix)
  123. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  124. =======
  125. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  126. >>>>>>> 94841b5 (Featire specs) =======
  127. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  128. >>>>>>> 3b03895 (Featire specs) =======
  129. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  130. >>>>>>> e54deeb (Featire specs) =======
  131. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  132. >>>>>>> 9c0d812 (Featire specs) =======
  133. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  134. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  135. =======
  136. >>>>>>> 752f0c0 (Featire specs) =======
  137. >>>>>>> 4e81ea2 (Featire specs) =======
  138. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  139. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  140. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  141. =======
  142. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  143. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  144. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  145. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  146. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  147. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  148. >>>>>>> a5d032d (Fix) =======
  149. =======
  150. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  151. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  152. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  153. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  154. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  155. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  156. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  157. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  158. >>>>>>> 7c4ea7f (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD form do |f| ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) def show >>>>>>> b90c395 (Fix book_spec decrease quantity and price)
  159. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  160. 2 ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) <<<<<<< HEAD
  161. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  162. =======
  163. >>>>>>> 752f0c0 (Featire specs) =======
  164. >>>>>>> 4e81ea2 (Featire specs) =======
  165. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  166. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
  167. 11 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  168. 11 =======
  169. 11 >>>>>>> 9620751 (Featire specs) =======
  170. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  171. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  172. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) =======
  173. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  174. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= =======
  175. 7 >>>>>>> 7a02bbe (Featire specs) =======
  176. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  177. 7 >>>>>>> 4552227 (Featire specs) =======
  178. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix)
  179. 15 >>>>>>> 7c4ea7f (Fix) book = Book.find(params[:id]) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= =======
  180. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= =======
  181. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  182. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD f.inputs do
  183. 2 f.input :name
  184. 2 f.input :books, as: :select, collection: Book.all
  185. end
  186. 2 f.actions
  187. end
  188. end

app/admin/coupons.rb

20.83% lines covered

24 relevant lines. 5 lines covered and 19 lines missed.
    
  1. 1 ActiveAdmin.register Coupon do
  2. 1 permit_params :code, :is_active, :active_till_date, :discount, :order_id
  3. 1 index do
  4. selectable_column
  5. column :code
  6. column :is_active
  7. column :active_till_date
  8. column :discount
  9. actions
  10. end
  11. 1 show do
  12. attributes_table do
  13. row :code
  14. row :is_active
  15. row :active_till_date
  16. row :discount
  17. row :order
  18. end
  19. end
  20. 1 form do |f|
  21. f.inputs do
  22. f.input :code
  23. f.input :is_active
  24. f.input :active_till_date
  25. f.input :discount
  26. f.input :order
  27. end
  28. f.actions
  29. end
  30. end

app/admin/dashboard.rb

44.44% lines covered

9 relevant lines. 4 lines covered and 5 lines missed.
    
  1. # frozen_string_literal: true
  2. 1 ActiveAdmin.register_page 'Dashboard' do
  3. 39 menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
  4. 1 action_item only: :show do
  5. link_to 'SideKiq View', sidekiq_web_path
  6. end
  7. 1 content title: proc { I18n.t('active_admin.dashboard') } do
  8. div class: 'blank_slate_container', id: 'dashboard_default_message' do
  9. span class: 'blank_slate' do
  10. span I18n.t('active_admin.dashboard_welcome.welcome')
  11. small I18n.t('active_admin.dashboard_welcome.call_to_action')
  12. end
  13. end
  14. end
  15. end

app/admin/orders.rb

19.23% lines covered

26 relevant lines. 5 lines covered and 21 lines missed.
    
  1. 1 ActiveAdmin.register Order do
  2. 1 permit_params :user_id, :coupon_id, :total_price, :status, :last_action
  3. 1 index do
  4. selectable_column
  5. column :user
  6. column :coupon
  7. column :total_price
  8. column :status
  9. column :last_action
  10. actions
  11. end
  12. 1 show do
  13. attributes_table do
  14. row :user
  15. row :coupon
  16. row :total_price
  17. row :status
  18. row :last_action
  19. end
  20. end ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) <<<<<<< HEAD @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @book = Book.find(params[:id]).decorate ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) book = Book.find_by(id: params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) book = Book.find(params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix)
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  22. =======
  23. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  24. >>>>>>> 94841b5 (Featire specs) =======
  25. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  26. >>>>>>> 3b03895 (Featire specs) =======
  27. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  28. >>>>>>> e54deeb (Featire specs) =======
  29. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  30. >>>>>>> 9c0d812 (Featire specs) =======
  31. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  32. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  33. =======
  34. >>>>>>> 752f0c0 (Featire specs) =======
  35. >>>>>>> 4e81ea2 (Featire specs) =======
  36. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  38. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  39. =======
  40. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  41. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  42. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  43. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  44. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  45. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  46. >>>>>>> a5d032d (Fix) =======
  47. =======
  48. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  49. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  50. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  51. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  52. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  53. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  54. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  55. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  56. >>>>>>> 7c4ea7f (Fix)
  57. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  58. 1 ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) <<<<<<< HEAD
  59. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  60. =======
  61. >>>>>>> 752f0c0 (Featire specs) =======
  62. >>>>>>> 4e81ea2 (Featire specs) =======
  63. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  64. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
  65. 11 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  66. 11 =======
  67. 11 >>>>>>> 9620751 (Featire specs) =======
  68. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  69. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  70. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) =======
  71. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  72. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  73. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  74. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  75. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= =======
  76. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  77. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  78. 15 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD form do |f| ======= if book.nil? >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) if book.nil? ======= redirect_to books_path if @book.nil? >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= if book.nil? >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= if book.nil? >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix)
  79. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  80. f.inputs do
  81. f.input :user_id
  82. f.input :coupon_id
  83. f.input :total_price
  84. f.input :status
  85. f.input :last_action
  86. f.input :books
  87. end
  88. f.actions
  89. ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) <<<<<<< HEAD
  90. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  91. =======
  92. >>>>>>> 752f0c0 (Featire specs) =======
  93. >>>>>>> 4e81ea2 (Featire specs) =======
  94. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
  95. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix)
  96. redirect_to books_path
  97. else
  98. 15 <<<<<<< HEAD ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
  99. 15 >>>>>>> a5d032d (Fix) @book = book.decorate
  100. <<<<<<< HEAD
  101. =======
  102. >>>>>>> a5d032d (Fix) end
  103. <<<<<<< HEAD <<<<<<< HEAD
  104. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= =======
  105. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= =======
  106. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  107. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= =======
  108. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= =======
  109. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= =======
  110. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= =======
  111. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  112. <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= =======
  113. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
  114. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
  115. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= =======
  116. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
  117. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= =======
  118. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= =======
  119. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= =======
  120. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  121. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  122. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) end
  123. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  124. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix)
>>>>>>> 715fac2 (Featire specs)

app/admin/admin_users.rb

40.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 20 relevant lines. 8 lines covered and 12 lines missed. ======= ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) 10 relevant lines. 10 lines covered and 0 lines missed. >>>>>>> 0b5b269 (Fix)
    
  1. 1 <<<<<<< HEAD ActiveAdmin.register AdminUser do ======= class ApplicationController < ActionController::Base
  2. 1 before_action :user_or_guest_have_order
  3. 1 private
  4. 1 def user_or_guest_have_order
  5. 187 if current_user
  6. 42 session[:order_id] = Order.find_or_create_by(user_id: current_user.id).id
  7. 42 CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
  8. 145 elsif session[:order_id].nil? || Order.where(id: session[:order_id]).empty?
  9. 55 session[:order_id] = Order.create.id
  10. 55 CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
  11. end
  12. end
  13. end
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix)

app/controllers/books_controller.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 93.33% ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) 93.75% >>>>>>> c4adab0 (Featire specs) ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 08edf50 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 7a02bbe (Featire specs) ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 93.75% >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 93.75% >>>>>>> 7c4ea7f (Fix) ======= 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= 93.75% >>>>>>> 8f1bc14 (Fix) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 0 lines missed. ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 15 relevant lines. 14 lines covered and ======= ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) 16 relevant lines. 15 lines covered and >>>>>>> 864f339 (Featire specs) 1 lines missed. <<<<<<< HEAD ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 9dc109d (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix)
    
  1. 1 class BooksController < ApplicationController >>>>>>> 715fac2 (Featire specs)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD permit_params :email, :password, :password_confirmation ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> 715fac2 (Featire specs)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD index do ======= ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) def index >>>>>>> 715fac2 (Featire specs)
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  5. ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  6. 24 <<<<<<< HEAD ======= =======
  7. ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix)
  8. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) 25 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  9. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  10. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  11. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs)
  12. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  13. 25 =======
  14. 25 >>>>>>> 9620751 (Featire specs) =======
  15. 25 >>>>>>> 9dc109d (Featire specs) =======
  16. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  17. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  18. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) =======
  19. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= =======
  20. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= =======
  21. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  22. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  23. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  24. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= =======
  25. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  26. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  27. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= =======
  28. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) selectable_column
  29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  30. ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  31. 24 <<<<<<< HEAD ======= =======
  32. ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix)
  33. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) 25 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  34. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  35. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  36. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs)
  37. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  38. 25 =======
  39. 25 >>>>>>> 9620751 (Featire specs) =======
  40. 25 >>>>>>> 9dc109d (Featire specs) =======
  41. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  42. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  43. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) =======
  44. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= =======
  45. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= =======
  46. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  47. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  48. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  49. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= =======
  50. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  51. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  52. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= =======
  53. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) id_column
  54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  55. ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  56. 24 <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 22ee41c (Add login registration pages)
  57. 24 =======
  58. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  59. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= =======
  60. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  61. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  62. 25 =======
  63. 25 >>>>>>> 9620751 (Featire specs) =======
  64. 25 >>>>>>> 9dc109d (Featire specs) =======
  65. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  66. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  67. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) =======
  68. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  69. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= =======
  70. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  71. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= =======
  72. 25 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= =======
  73. 25 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD column :email ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d15fe1d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> 27e3351 (Featire specs) sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix)
  74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  75. ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> 27e3351 (Featire specs)
  76. >>>>>>> 836a973 (Rebased) =======
  77. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  78. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  79. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) =======
  80. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  81. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  82. >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  83. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) =======
  84. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  85. >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD column :current_sign_in_at ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> 27e3351 (Featire specs) per_page: Constants::PAGINATION_PER_PAGE) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> 8f1bc14 (Fix)
  86. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix)
  87. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= def index
  88. 25 @books_count = Book.count
  89. 25 @categories = Category.all
  90. 25 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  91. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) =======
  92. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  93. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a624084 (Add login registration pages) =======
  94. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= =======
  95. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= =======
  96. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) sorted_books = BookQuery.query(params).paginate(page: params[:page],
  97. per_page: PAGINATION_PER_PAGE) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix)
  98. <<<<<<< HEAD
  99. column :sign_in_count
  100. column :created_at
  101. actions
  102. end
  103. =======
  104. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  105. >>>>>>> 752f0c0 (Featire specs) =======
  106. >>>>>>> 4e81ea2 (Featire specs) =======
  107. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix)
  108. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  109. 1 ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  110. 24 <<<<<<< HEAD ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  111. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  112. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= =======
  113. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  114. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD filter :email
  115. 1 filter :current_sign_in_at
  116. 1 filter :sign_in_count
  117. 1 filter :created_at
  118. 1 form do |f|
  119. f.inputs do
  120. f.input :email
  121. f.input :password
  122. f.input :password_confirmation
  123. end
  124. f.actions
  125. end
  126. end

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Author do
  2. 1 config.filters = true
  3. 1 permit_params :first_name, :last_name
  4. 1 filter :books, collection: Book.all
  5. 1 filter :first_name
  6. 1 filter :last_name
  7. 1 index do
  8. 3 selectable_column ======= <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
  9. <<<<<<< HEAD
  10. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  11. =======
  12. >>>>>>> 752f0c0 (Featire specs) =======
  13. >>>>>>> 4e81ea2 (Featire specs) =======
  14. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  15. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  16. <<<<<<< HEAD
  17. 3 ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  18. 24 <<<<<<< HEAD ======= =======
  19. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  20. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= =======
  21. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= =======
  22. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= =======
  23. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 9dc109d (Featire specs) =======
  24. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  25. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  26. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= <<<<<<< HEAD =======
  27. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  28. 25 >>>>>>> 730a8ca (Add login registration pages) =======
  29. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a624084 (Add login registration pages) =======
  30. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  31. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= =======
  32. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= =======
  33. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books)
  34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  35. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) =======
  36. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  37. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  38. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  39. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  40. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  41. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= =======
  42. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= =======
  43. 25 >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  44. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  45. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= =======
  46. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= =======
  47. 25 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) column :first_name
  48. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  49. 3 ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  50. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  51. 24 <<<<<<< HEAD ======= =======
  52. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  53. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  54. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  55. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= =======
  56. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs)
  57. 25 =======
  58. 25 >>>>>>> 9620751 (Featire specs) =======
  59. 25 >>>>>>> 9dc109d (Featire specs) =======
  60. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  61. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  62. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  63. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> e54ceb0 (Featire specs) =======
  64. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  65. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  66. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  67. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= =======
  68. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  69. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  70. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= =======
  71. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= =======
  72. 25 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= =======
  73. 25 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) column :last_name
  74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  75. ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  76. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  77. 24 <<<<<<< HEAD ======= =======
  78. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  79. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  80. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  81. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= =======
  82. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs)
  83. 25 =======
  84. 25 >>>>>>> 9620751 (Featire specs) =======
  85. 25 >>>>>>> 9dc109d (Featire specs) =======
  86. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  87. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  88. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  89. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> e54ceb0 (Featire specs) =======
  90. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  91. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  92. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  93. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= =======
  94. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  95. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  96. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= =======
  97. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= =======
  98. 25 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= =======
  99. 25 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix)
  100. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  101. 3 ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD
  102. =======
  103. >>>>>>> 5a0bcc7 (Featire specs) =======
  104. >>>>>>> 95ebdc2 (Featire specs) =======
  105. >>>>>>> e54ceb0 (Featire specs) =======
  106. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  107. >>>>>>> 94841b5 (Featire specs) =======
  108. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  109. >>>>>>> 3b03895 (Featire specs) =======
  110. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  111. >>>>>>> e54deeb (Featire specs) =======
  112. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  113. >>>>>>> 9c0d812 (Featire specs) =======
  114. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  115. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  116. =======
  117. >>>>>>> 752f0c0 (Featire specs) =======
  118. >>>>>>> 4e81ea2 (Featire specs) =======
  119. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  120. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  121. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs)
  122. =======
  123. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  124. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  125. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  126. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  127. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  128. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  129. >>>>>>> a5d032d (Fix) =======
  130. =======
  131. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  132. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  133. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  134. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  135. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  136. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  137. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  138. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  139. >>>>>>> 7c4ea7f (Fix) =======
  140. =======
  141. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= =======
  142. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= =======
  143. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= =======
  144. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) ======= =======
  145. >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) =======
  146. >>>>>>> 8f1bc14 (Fix) 1 >>>>>>> 715fac2 (Featire specs) actions
  147. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  148. ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix)
  149. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  150. >>>>>>> 94841b5 (Featire specs) =======
  151. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  152. >>>>>>> 3b03895 (Featire specs) =======
  153. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  154. >>>>>>> e54deeb (Featire specs) =======
  155. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  156. >>>>>>> 9c0d812 (Featire specs) =======
  157. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  158. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  159. =======
  160. >>>>>>> 752f0c0 (Featire specs) =======
  161. >>>>>>> 4e81ea2 (Featire specs) =======
  162. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  163. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  164. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  165. =======
  166. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  167. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  168. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  169. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  170. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  171. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  172. >>>>>>> a5d032d (Fix) =======
  173. =======
  174. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  175. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  176. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  177. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  178. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  179. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  180. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  181. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  182. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD end ======= entries: render_to_string(partial: 'books/index/books', formats: [:html]), >>>>>>> 0b5b269 (Fix)
  183. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  184. =======
  185. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  186. >>>>>>> 94841b5 (Featire specs) =======
  187. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  188. >>>>>>> 3b03895 (Featire specs) =======
  189. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  190. >>>>>>> e54deeb (Featire specs) =======
  191. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  192. >>>>>>> 9c0d812 (Featire specs) =======
  193. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  194. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  195. =======
  196. >>>>>>> 752f0c0 (Featire specs) =======
  197. >>>>>>> 4e81ea2 (Featire specs) =======
  198. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  199. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  200. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  201. =======
  202. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  203. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  204. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  205. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  206. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  207. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  208. >>>>>>> a5d032d (Fix) =======
  209. =======
  210. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  211. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  212. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  213. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  214. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  215. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  216. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  217. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  218. >>>>>>> 7c4ea7f (Fix)
  219. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  220. 1 show do
  221. 3 attributes_table do
  222. 3 row :first_name
  223. 3 row :last_name
  224. 3 row :books
  225. ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD
  226. =======
  227. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  228. >>>>>>> 94841b5 (Featire specs) =======
  229. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  230. >>>>>>> 3b03895 (Featire specs) =======
  231. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  232. >>>>>>> e54deeb (Featire specs) =======
  233. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  234. >>>>>>> 9c0d812 (Featire specs) =======
  235. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  236. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  237. =======
  238. >>>>>>> 752f0c0 (Featire specs) =======
  239. >>>>>>> 4e81ea2 (Featire specs) =======
  240. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= =======
  241. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  242. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  243. =======
  244. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= =======
  245. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
  246. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= =======
  247. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= =======
  248. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= =======
  249. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  250. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= =======
  251. =======
  252. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
  253. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
  254. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======
  255. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= =======
  256. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======
  257. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= =======
  258. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  259. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  260. >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) end
  261. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  262. end
  263. 1 form do |f|
  264. 2 f.inputs do
  265. 2 f.input :first_name
  266. 2 f.input :last_name
  267. 2 f.input :books, as: :select, collection: Book.all
  268. end
  269. 2 f.actions
  270. end
  271. end

app/admin/books.rb

100.0% lines covered

51 relevant lines. 51 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Book do
  2. 1 permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
  3. author_ids: [], category_ids: [], images: []
  4. 1 decorate_with BookDecorator
  5. 1 filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
  6. 1 filter :categories
  7. 1 filter :title
  8. 1 filter :year_of_publication
  9. 1 index do
  10. 6 selectable_column
  11. 6 column :categories, &:categories_names
  12. 6 column :title
  13. 6 column :authors, &:authors_names
  14. 6 column :description
  15. 6 column :price, &:price
  16. 6 column :quantity
  17. 6 actions
  18. end
  19. 1 show do
  20. 5 attributes_table do
  21. 5 row :authors, &:authors_names
  22. 5 row :categories, &:categories_names
  23. 5 row :year_of_publication
  24. 5 row :description
  25. 5 row :materials
  26. 5 row :dimensions
  27. 5 row :price, &:price
  28. 5 row :created_at
  29. 5 row :updated_at
  30. end
  31. 5 panel :images do
  32. 5 table do
  33. 5 book.images.each do |image|
  34. 2 span image_tag image.variant(resize_to_limit: [100, 100])
  35. end
  36. ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD
  37. =======
  38. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  39. >>>>>>> 94841b5 (Featire specs) =======
  40. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  41. >>>>>>> 3b03895 (Featire specs) =======
  42. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  43. >>>>>>> e54deeb (Featire specs) =======
  44. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  45. >>>>>>> 9c0d812 (Featire specs) =======
  46. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  47. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  48. =======
  49. >>>>>>> 752f0c0 (Featire specs) =======
  50. >>>>>>> 4e81ea2 (Featire specs) =======
  51. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= =======
  52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  53. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  54. =======
  55. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= =======
  56. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
  57. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= =======
  58. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= =======
  59. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= =======
  60. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  61. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= =======
  62. =======
  63. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
  64. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
  65. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======
  66. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= =======
  67. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======
  68. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= =======
  69. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  70. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  71. >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) end
  72. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  73. end
  74. end
  75. 1 form do |f|
  76. 6 f.inputs do
  77. 6 f.input :title
  78. 6 f.input :description
  79. 6 f.input :year_of_publication
  80. 6 f.input :price_cents
  81. 6 f.input :materials
  82. 6 f.input :dimensions
  83. 6 f.input :quantity
  84. 6 f.input :categories, as: :select, collection: Category.all
  85. 6 f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  86. 6 f.input :images, as: :file, input_html: { multiple: true }
  87. end
  88. 6 panel :images do
  89. 6 f.object.images.each do |image|
  90. 1 span image_tag image.variant(resize_to_limit: [100, 100])
  91. 1 span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
  92. data: { confirm: "Delete #{image.filename}?" })
  93. end
  94. end
  95. 6 f.actions
  96. end
  97. 1 member_action :delete_image, method: :delete do
  98. 1 ActiveStorage::Attachment.find(params[:id]).purge_later
  99. 1 redirect_back(fallback_location: edit_admin_book_path)
  100. end
  101. end

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Category do
  2. 1 permit_params :name, book_ids: []
  3. 1 filter :books, collection: Book.all
  4. 1 filter :name
  5. 1 index do
  6. 4 selectable_column
  7. 4 column :name
  8. 4 actions
  9. end
  10. 1 show do
  11. 3 attributes_table do
  12. 3 row :name
  13. 3 row :created_at
  14. 3 row :updated_at
  15. ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 0b5b269 (Fix)
  16. =======
  17. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  18. >>>>>>> 94841b5 (Featire specs) =======
  19. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  20. >>>>>>> 3b03895 (Featire specs) =======
  21. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  22. >>>>>>> e54deeb (Featire specs) =======
  23. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  24. >>>>>>> 9c0d812 (Featire specs) =======
  25. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  26. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  27. =======
  28. >>>>>>> 752f0c0 (Featire specs) =======
  29. >>>>>>> 4e81ea2 (Featire specs) =======
  30. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  31. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  32. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  33. =======
  34. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  35. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  36. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  38. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  40. >>>>>>> a5d032d (Fix) =======
  41. =======
  42. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  43. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  44. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  45. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  46. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  47. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  48. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  49. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  50. >>>>>>> 7c4ea7f (Fix) end
  51. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  52. =======
  53. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  54. >>>>>>> 94841b5 (Featire specs) =======
  55. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  56. >>>>>>> 3b03895 (Featire specs) =======
  57. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  58. >>>>>>> e54deeb (Featire specs) =======
  59. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  60. >>>>>>> 9c0d812 (Featire specs) =======
  61. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  62. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  63. =======
  64. >>>>>>> 752f0c0 (Featire specs) =======
  65. >>>>>>> 4e81ea2 (Featire specs) =======
  66. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  68. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  69. =======
  70. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  71. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  72. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  73. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  74. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  75. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  76. >>>>>>> a5d032d (Fix) =======
  77. =======
  78. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  79. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  80. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  81. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  82. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  83. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  84. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  85. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  86. >>>>>>> 7c4ea7f (Fix) end
  87. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  88. =======
  89. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  90. >>>>>>> 94841b5 (Featire specs) =======
  91. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  92. >>>>>>> 3b03895 (Featire specs) =======
  93. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  94. >>>>>>> e54deeb (Featire specs) =======
  95. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  96. >>>>>>> 9c0d812 (Featire specs) =======
  97. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  98. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  99. =======
  100. >>>>>>> 752f0c0 (Featire specs) =======
  101. >>>>>>> 4e81ea2 (Featire specs) =======
  102. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  103. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  104. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  105. =======
  106. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  107. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  108. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  109. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  110. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  111. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  112. >>>>>>> a5d032d (Fix) =======
  113. =======
  114. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  115. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  116. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  117. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  118. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  119. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  120. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  121. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  122. >>>>>>> 7c4ea7f (Fix)
  123. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  124. =======
  125. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  126. >>>>>>> 94841b5 (Featire specs) =======
  127. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  128. >>>>>>> 3b03895 (Featire specs) =======
  129. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  130. >>>>>>> e54deeb (Featire specs) =======
  131. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  132. >>>>>>> 9c0d812 (Featire specs) =======
  133. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  134. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  135. =======
  136. >>>>>>> 752f0c0 (Featire specs) =======
  137. >>>>>>> 4e81ea2 (Featire specs) =======
  138. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  139. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  140. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  141. =======
  142. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  143. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  144. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  145. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  146. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  147. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  148. >>>>>>> a5d032d (Fix) =======
  149. =======
  150. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  151. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  152. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  153. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  154. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  155. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  156. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  157. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  158. >>>>>>> 7c4ea7f (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD form do |f| ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) def show >>>>>>> da83d1a (Fix book_spec decrease quantity and price)
  159. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  160. 2 ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD
  161. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  162. =======
  163. >>>>>>> 752f0c0 (Featire specs) =======
  164. >>>>>>> 4e81ea2 (Featire specs) =======
  165. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  166. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
  167. 11 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  168. 11 =======
  169. 11 >>>>>>> 9620751 (Featire specs) =======
  170. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  171. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  172. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) =======
  173. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  174. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= =======
  175. 7 >>>>>>> 7a02bbe (Featire specs) =======
  176. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  177. 7 >>>>>>> 4552227 (Featire specs) =======
  178. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix)
  179. 15 >>>>>>> 7c4ea7f (Fix) book = Book.find(params[:id]) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= =======
  180. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= =======
  181. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  182. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD f.inputs do
  183. 2 f.input :name
  184. 2 f.input :books, as: :select, collection: Book.all
  185. end
  186. ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix)
  187. =======
  188. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  189. >>>>>>> 94841b5 (Featire specs) =======
  190. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  191. >>>>>>> 3b03895 (Featire specs) =======
  192. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  193. >>>>>>> e54deeb (Featire specs) =======
  194. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  195. >>>>>>> 9c0d812 (Featire specs) =======
  196. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  197. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  198. =======
  199. >>>>>>> 752f0c0 (Featire specs) =======
  200. >>>>>>> 4e81ea2 (Featire specs) =======
  201. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  202. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  203. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs)
  204. =======
  205. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  206. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  207. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  208. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  209. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  210. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  211. >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  212. =======
  213. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= =======
  214. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= =======
  215. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  216. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  217. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  218. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  219. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  220. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  221. end

app/controllers/checkouts_controller.rb

47.76% lines covered

67 relevant lines. 32 lines covered and 35 lines missed.
    
  1. 1 require_relative '../services/checkout_service'
  2. 1 class CheckoutsController < ApplicationController
  3. 1 before_action :authenticate_user!, only: %i[show update]
  4. 1 def new; end
  5. 1 def create
  6. 2 user = User.new(email: permitted_params[:user][:email],
  7. password: Devise.friendly_token.first(Devise.password_length.first))
  8. 2 user.skip_confirmation!
  9. 2 order = Order.find(session[:order_id])
  10. 2 if user.save
  11. 1 sign_in(:user, user)
  12. 1 user.send_reset_password_instructions
  13. 1 order.update(user_id: user.id)
  14. 1 redirect_to checkout_path(step: :address)
  15. else
  16. 1 redirect_to new_checkout_path, alert: I18n.t('checkout.error_message')
  17. end
  18. end
  19. 1 def show
  20. 2 @order = Order.find(session[:order_id]).decorate
  21. 2 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  22. 2 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  23. 2 @credit_card = CreditCard.find_or_create_by(user_id: current_user.id)
  24. 2 step = permitted_params[:step]
  25. 2 case step
  26. when 'initialize' then render 'checkouts/new'
  27. when 'delivery' then render 'checkouts/delivery'
  28. 2 when 'address' then render 'checkouts/address'
  29. when 'payment' then render 'checkouts/payment'
  30. when 'confirm' then render 'checkouts/confirm'
  31. when 'complete' then render 'checkouts/complete'
  32. else
  33. render 'checkouts/address'
  34. end
  35. end
  36. 1 def update
  37. @order = Order.find(session[:order_id]).decorate
  38. @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  39. @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  40. @credit_card = CreditCard.find_or_create_by(user_id: current_user.id)
  41. case permitted_params[:step]
  42. when 'address' then update_address(permitted_params)
  43. when 'payment' then update_payment(permitted_params)
  44. when 'confirm' then update_confirm
  45. end
  46. end
  47. 1 private
  48. 1 def permitted_params
  49. 4 params.permit(
  50. :step, :code,
  51. user: %i[password current_password password_confirmation email],
  52. billing: %i[first_name last_name address city zip country phone],
  53. shipping: %i[first_name last_name address city zip country phone],
  54. credit_card: %i[name code cvv expiration_date]
  55. )
  56. end
  57. 1 def update_address(permitted_params)
  58. if permitted_params[:shipping].nil?
  59. update_billing(permitted_params[:billing])
  60. else
  61. update_shipping(permitted_params[:shipping])
  62. end
  63. end
  64. 1 def update_shipping(params)
  65. if @user_shipping.update(params)
  66. redirect_to checkout_path(step: :address), notice: 'Shipping was updated'
  67. else
  68. redirect_to checkout_path(step: :address), alert: CheckoutService.to_errors(@user_shipping.errors.messages)
  69. end
  70. end
  71. 1 def update_billing(params)
  72. if @user_billing.update(params)
  73. redirect_to checkout_path(step: :address), notice: 'Billing was updated'
  74. else
  75. redirect_to checkout_path(step: :address), alert: CheckoutService.to_errors(@user_billing.errors.messages)
  76. end
  77. end
  78. 1 def update_payment(permitted_params)
  79. if @credit_card.update(permitted_params[:credit_card])
  80. redirect_to checkout_path(step: :confirm)
  81. else
  82. redirect_to checkout_path(step: :payment), alert: CheckoutService.to_errors(@credit_card.errors.messages)
  83. end
  84. end
  85. 1 def update_confirm
  86. @order.coupon&.update(is_active: false)
  87. if @order.update(status: :created, total_price: count_total_price)
  88. redirect_to root_path, notice: 'Order was created!'
  89. else
  90. redirect_to checkout_path(step: :confirm), alert: 'Something went wrong'
  91. end
  92. end
  93. 1 def count_total_price
  94. product = OrderBook.where(order_id: @order.id)
  95. total_price = product.map do |order|
  96. order.book.price_cents * order.quantity
  97. end.sum
  98. total_price *= @order.coupon.discount unless @order.coupon.nil?
  99. total_price + @order.delivery.price_cents
  100. end
  101. end

app/controllers/coupons_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 class CouponsController < ApplicationController
  3. 1 def find
  4. 4 coupon = Coupon.find_by(code: params[:code])
  5. 4 order = Order.find(session[:order_id])
  6. 4 coupon&.update(order_id: order.id)
  7. 4 respond_to do |format|
  8. 4 format.json do
  9. 4 render json: CouponService.find_coupon(params, order, coupon)
  10. end
  11. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  12. 2 f.actions
  13. end
  14. end

app/admin/coupons.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Coupon do
  2. 1 permit_params :code, :is_active, :active_till_date, :discount, :order_id
  3. end

app/admin/dashboard.rb

44.44% lines covered

9 relevant lines. 4 lines covered and 5 lines missed.
    
  1. # frozen_string_literal: true
  2. 1 ActiveAdmin.register_page 'Dashboard' do
  3. 39 menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
  4. 1 action_item only: :show do
  5. link_to 'SideKiq View', sidekiq_web_path
  6. end
  7. 1 content title: proc { I18n.t('active_admin.dashboard') } do
  8. div class: 'blank_slate_container', id: 'dashboard_default_message' do
  9. span class: 'blank_slate' do
  10. span I18n.t('active_admin.dashboard_welcome.welcome')
  11. small I18n.t('active_admin.dashboard_welcome.call_to_action') ======= ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) <<<<<<< HEAD ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4552227 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) } >>>>>>> 93db8b1 (Featire specs)
  12. end
  13. end
  14. end
  15. end

app/admin/orders.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Order do
  2. 1 permit_params :user_id, :coupon_id, :total_price, :status, :last_action
  3. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) <<<<<<< HEAD @book = Book.find(params[:id]).decorate >>>>>>> 715fac2 (Featire specs) ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> ee78f39 (Rebased)

app/admin/admin_users.rb

40.0% lines covered

20 relevant lines. 8 lines covered and 12 lines missed.
    
  1. 1 ActiveAdmin.register AdminUser do
  2. 1 permit_params :email, :password, :password_confirmation
  3. 1 index do
  4. selectable_column
  5. id_column
  6. column :email
  7. column :current_sign_in_at
  8. column :sign_in_count
  9. column :created_at
  10. actions
  11. end
  12. 1 filter :email
  13. 1 filter :current_sign_in_at
  14. 1 filter :sign_in_count
  15. 1 filter :created_at
  16. 1 <<<<<<< HEAD form do |f| ======= def show
  17. 7 @book = Book.find_by(id: params[:id])
  18. <<<<<<< HEAD <<<<<<< HEAD =======
  19. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) =======
  20. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) =======
  21. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 7 redirect_to books_path if @book.nil? >>>>>>> 9bf2aae (Featire specs)
  22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  23. =======
  24. <<<<<<< HEAD <<<<<<< HEAD =======
  25. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) =======
  26. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) =======
  27. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 7 >>>>>>> b90c395 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD f.inputs do ======= ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) <<<<<<< HEAD @book = Book.find_by(id: params[:id]) ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
  28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  29. ======= ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) <<<<<<< HEAD
  30. =======
  31. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= =======
  32. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= =======
  33. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) f.input :email
  34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  35. ======= ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) <<<<<<< HEAD
  36. =======
  37. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  38. >>>>>>> 7a02bbe (Featire specs) =======
  39. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) 7 >>>>>>> b90c395 (Fix book_spec decrease quantity and price) f.input :password
  40. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  41. ======= ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price)
  42. =======
  43. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= =======
  44. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= =======
  45. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) f.input :password_confirmation
  46. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  47. =======
  48. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  49. >>>>>>> 7a02bbe (Featire specs) =======
  50. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
  51. f.actions
  52. ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= =======
  53. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= =======
  54. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= =======
  55. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= =======
  56. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price) end
  57. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  58. end

app/admin/authors.rb

100.0% lines covered

22 relevant lines. 22 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Author do
  2. 1 config.filters = true
  3. 1 permit_params :first_name, :last_name
  4. 1 filter :books, collection: Book.all
  5. 1 filter :first_name
  6. 1 filter :last_name
  7. 1 index do
  8. 3 selectable_column
  9. 3 column :first_name
  10. 3 column :last_name
  11. 3 actions
  12. end
  13. 1 show do
  14. 3 attributes_table do
  15. 3 row :first_name
  16. 3 row :last_name
  17. 3 row :books
  18. end
  19. end ======= ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) @book = Book.find(params[:id]).decorate ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) book = Book.find_by(id: params[:id]) ======= @book = Book.find_by(id: params[:id]) ======= <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) book = Book.find(params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix)
  20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  21. =======
  22. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  23. >>>>>>> 94841b5 (Featire specs) =======
  24. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  25. >>>>>>> 3b03895 (Featire specs) =======
  26. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  27. >>>>>>> e54deeb (Featire specs) =======
  28. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  29. >>>>>>> 9c0d812 (Featire specs) =======
  30. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  31. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  32. =======
  33. >>>>>>> 752f0c0 (Featire specs) =======
  34. >>>>>>> 4e81ea2 (Featire specs) =======
  35. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  36. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  37. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  38. =======
  39. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  40. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  41. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  42. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  43. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  44. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  45. >>>>>>> a5d032d (Fix) =======
  46. =======
  47. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= =======
  48. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= =======
  49. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  50. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  51. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  52. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  53. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  54. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  55. >>>>>>> 7c4ea7f (Fix) ======= =======
  56. >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= =======
  57. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
  58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  59. 1 ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD
  60. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  61. ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
  62. >>>>>>> 752f0c0 (Featire specs) =======
  63. >>>>>>> 4e81ea2 (Featire specs) =======
  64. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  65. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
  66. 11 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  67. 11 =======
  68. 11 >>>>>>> 9620751 (Featire specs) =======
  69. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  70. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  71. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) =======
  72. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  73. <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  74. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= =======
  75. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  76. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  77. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  78. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= =======
  79. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  80. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  81. 15 >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD form do |f| ======= if book.nil? >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) if book.nil? ======= redirect_to books_path if @book.nil? >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= if book.nil? >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= if book.nil? >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix)
  82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  83. 2 f.inputs do
  84. 2 f.input :first_name
  85. 2 f.input :last_name
  86. 2 f.input :books, as: :select, collection: Book.all
  87. end
  88. 2 f.actions
  89. ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD
  90. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  91. ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
  92. >>>>>>> 752f0c0 (Featire specs) =======
  93. >>>>>>> 4e81ea2 (Featire specs) =======
  94. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= =======
  95. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix)
  96. redirect_to books_path
  97. else
  98. 15 <<<<<<< HEAD ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
  99. 15 >>>>>>> a5d032d (Fix) @book = book.decorate
  100. <<<<<<< HEAD
  101. =======
  102. >>>>>>> a5d032d (Fix) end
  103. <<<<<<< HEAD <<<<<<< HEAD
  104. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= =======
  105. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= =======
  106. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
  107. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= =======
  108. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= =======
  109. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= =======
  110. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= =======
  111. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  112. <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= =======
  113. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
  114. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
  115. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= =======
  116. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======
  117. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= =======
  118. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======
  119. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= =======
  120. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  121. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  122. >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= =======
  123. >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= =======
  124. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) end
  125. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  126. end

app/admin/books.rb

100.0% lines covered

<<<<<<< HEAD 51 relevant lines. 51 lines covered and ======= 41 relevant lines. 41 lines covered and >>>>>>> ee78f39 (Rebased) 0 lines missed.
    
  1. 1 ActiveAdmin.register Book do
  2. 1 permit_params :title, :description, :price_cents, :dimensions, :year_of_publication, :materials, :quantity,
  3. <<<<<<< HEAD author_ids: [], category_ids: [], images: [] ======= category_ids: [], author_ids: [] >>>>>>> ee78f39 (Rebased)
  4. 1 decorate_with BookDecorator
  5. 1 filter :authors, collection: AuthorDecorator.decorate_collection(Author.all)
  6. 1 filter :categories
  7. 1 filter :title
  8. 1 filter :year_of_publication
  9. 1 index do
  10. <<<<<<< HEAD
  11. 6 =======
  12. 4 >>>>>>> ee78f39 (Rebased) selectable_column
  13. <<<<<<< HEAD
  14. 6 column :categories, &:categories_names
  15. 6 =======
  16. 4 >>>>>>> ee78f39 (Rebased) column :title
  17. <<<<<<< HEAD
  18. 6 =======
  19. 4 >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD column :authors, &:authors_names ======= column :year_of_publication >>>>>>> ee78f39 (Rebased)
  20. <<<<<<< HEAD
  21. 6 =======
  22. 4 >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD column :description ======= column :materials >>>>>>> ee78f39 (Rebased)
  23. <<<<<<< HEAD
  24. 6 =======
  25. 4 >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD column :price, &:price ======= column :dimensions >>>>>>> ee78f39 (Rebased)
  26. <<<<<<< HEAD
  27. 6 =======
  28. 4 column :price_cents, &:price
  29. 4 >>>>>>> ee78f39 (Rebased) column :quantity
  30. <<<<<<< HEAD
  31. =======
  32. 4 >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD ======= column :authors, &:authors_names >>>>>>> ee78f39 (Rebased)
  33. <<<<<<< HEAD
  34. 6 =======
  35. 4 >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD actions ======= column :categories, &:categories_names >>>>>>> ee78f39 (Rebased)
  36. <<<<<<< HEAD =======
  37. 4 actions
  38. >>>>>>> ee78f39 (Rebased) end
  39. <<<<<<< HEAD ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
  40. =======
  41. >>>>>>> ee78f39 (Rebased)
  42. <<<<<<< HEAD
  43. =======
  44. >>>>>>> ee78f39 (Rebased) 1 show do
  45. <<<<<<< HEAD
  46. 5 =======
  47. 3 >>>>>>> ee78f39 (Rebased) attributes_table do
  48. <<<<<<< HEAD
  49. 5 =======
  50. 3 >>>>>>> ee78f39 (Rebased) row :authors, &:authors_names
  51. <<<<<<< HEAD
  52. 5 =======
  53. 3 >>>>>>> ee78f39 (Rebased) row :categories, &:categories_names
  54. <<<<<<< HEAD
  55. 5 =======
  56. 3 >>>>>>> ee78f39 (Rebased) row :year_of_publication
  57. <<<<<<< HEAD
  58. 5 =======
  59. 3 >>>>>>> ee78f39 (Rebased) row :description
  60. <<<<<<< HEAD
  61. 5 =======
  62. 3 >>>>>>> ee78f39 (Rebased) row :materials
  63. <<<<<<< HEAD
  64. 5 =======
  65. 3 >>>>>>> ee78f39 (Rebased) row :dimensions
  66. <<<<<<< HEAD
  67. 5 =======
  68. 3 >>>>>>> ee78f39 (Rebased) row :price, &:price
  69. <<<<<<< HEAD
  70. 5 =======
  71. 3 >>>>>>> ee78f39 (Rebased) row :created_at
  72. <<<<<<< HEAD
  73. 5 =======
  74. 3 >>>>>>> ee78f39 (Rebased) row :updated_at
  75. <<<<<<< HEAD
  76. =======
  77. >>>>>>> ee78f39 (Rebased) end
  78. <<<<<<< HEAD
  79. 5 panel :images do
  80. 5 table do
  81. 5 book.images.each do |image|
  82. 2 span image_tag image.variant(resize_to_limit: [100, 100])
  83. end
  84. end
  85. end
  86. =======
  87. >>>>>>> ee78f39 (Rebased) end
  88. <<<<<<< HEAD
  89. =======
  90. >>>>>>> ee78f39 (Rebased)
  91. <<<<<<< HEAD
  92. =======
  93. >>>>>>> ee78f39 (Rebased) 1 form do |f|
  94. <<<<<<< HEAD
  95. 6 =======
  96. 2 >>>>>>> ee78f39 (Rebased) f.inputs do
  97. <<<<<<< HEAD
  98. 6 =======
  99. 2 >>>>>>> ee78f39 (Rebased) f.input :title
  100. <<<<<<< HEAD
  101. 6 f.input :description
  102. 6 =======
  103. 2 >>>>>>> ee78f39 (Rebased) f.input :year_of_publication
  104. <<<<<<< HEAD
  105. 6 =======
  106. 2 >>>>>>> ee78f39 (Rebased) f.input :price_cents
  107. <<<<<<< HEAD
  108. 6 =======
  109. 2 >>>>>>> ee78f39 (Rebased) f.input :materials
  110. <<<<<<< HEAD
  111. 6 =======
  112. 2 >>>>>>> ee78f39 (Rebased) f.input :dimensions
  113. <<<<<<< HEAD
  114. 6 =======
  115. 2 >>>>>>> ee78f39 (Rebased) f.input :quantity
  116. <<<<<<< HEAD =======
  117. 2 f.input :description, as: :text
  118. 2 f.input :categories, as: :select, collection: Category.all
  119. 2 f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  120. end
  121. 2 f.actions
  122. >>>>>>> ee78f39 (Rebased)
  123. <<<<<<< HEAD
  124. 6 f.input :categories, as: :select, collection: Category.all
  125. 6 f.input :authors, as: :select, collection: AuthorDecorator.decorate_collection(Author.all)
  126. 6 f.input :images, as: :file, input_html: { multiple: true }
  127. end
  128. 6 panel :images do
  129. 6 f.object.images.each do |image|
  130. 1 span image_tag image.variant(resize_to_limit: [100, 100])
  131. 1 span link_to('Delete', delete_image_admin_book_path(image.id), method: :delete,
  132. data: { confirm: "Delete #{image.filename}?" })
  133. end
  134. end
  135. 6 f.actions
  136. ======= >>>>>>> ee78f39 (Rebased) end
  137. <<<<<<< HEAD
  138. 1 member_action :delete_image, method: :delete do
  139. 1 ActiveStorage::Attachment.find(params[:id]).destroy
  140. 1 redirect_back(fallback_location: edit_admin_book_path)
  141. end
  142. =======
  143. >>>>>>> ee78f39 (Rebased) end

app/admin/categories.rb

100.0% lines covered

18 relevant lines. 18 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.register Category do
  2. 1 permit_params :name, book_ids: []
  3. 1 filter :books, collection: Book.all
  4. 1 filter :name
  5. 1 index do
  6. 4 selectable_column
  7. 4 column :name
  8. 4 actions
  9. end
  10. 1 show do
  11. 3 attributes_table do
  12. 3 row :name
  13. 3 row :created_at
  14. 3 row :updated_at
  15. end
  16. end
  17. 1 form do |f|
  18. 2 f.inputs do
  19. 2 f.input :name
  20. 2 f.input :books, as: :select, collection: Book.all
  21. end
  22. ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 0b5b269 (Fix)
  23. =======
  24. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  25. >>>>>>> 94841b5 (Featire specs) =======
  26. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  27. >>>>>>> 3b03895 (Featire specs) =======
  28. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  29. >>>>>>> e54deeb (Featire specs) =======
  30. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  31. >>>>>>> 9c0d812 (Featire specs) =======
  32. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  33. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  34. =======
  35. >>>>>>> 752f0c0 (Featire specs) =======
  36. >>>>>>> 4e81ea2 (Featire specs) =======
  37. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  38. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  39. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs)
  40. =======
  41. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  42. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  43. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  44. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  45. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  46. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  47. >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  48. =======
  49. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= =======
  50. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= =======
  51. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= =======
  52. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= =======
  53. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  54. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= =======
  55. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  56. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  57. end

app/controllers/checkouts_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed.
    
  1. 1 class CheckoutsController < ApplicationController
  2. 1 def new; end
  3. 1 def create
  4. 2 user = User.new(email: params[:user][:email], password: Devise.friendly_token.first(Devise.password_length.first))
  5. 2 user.skip_confirmation!
  6. 2 if user.save
  7. 1 sign_in(:user, user)
  8. 1 user.send_reset_password_instructions
  9. 1 redirect_to order_path(session[:order_id])
  10. else
  11. 1 redirect_to new_checkout_path, alert: I18n.t('checkout.error_message')
  12. ======= >>>>>>> aa4fb26 (Add sort orders) end
  13. end
  14. <<<<<<< HEAD end

app/controllers/coupons_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 class CouponsController < ApplicationController
  3. 1 def find
  4. 4 coupon = Coupon.find_by(code: params[:code])
  5. 4 order = Order.find(session[:order_id])
  6. 4 respond_to do |format|
  7. 4 format.json do
  8. 4 render json: CouponService.find_coupon(params, order, coupon)
  9. end
  10. end
  11. end
  12. >>>>>>> 7c4ea7f (Fix) ======= =======
  13. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) } >>>>>>> f5da5ac (Featire specs)
  14. 2 f.actions
  15. end
  16. end

app/admin/dashboard.rb

42.86% lines covered

7 relevant lines. 3 lines covered and 4 lines missed.
    
  1. # frozen_string_literal: true
  2. 1 ActiveAdmin.register_page 'Dashboard' do
  3. <<<<<<< HEAD
  4. 39 =======
  5. 31 >>>>>>> ee78f39 (Rebased) menu priority: 1, label: proc { I18n.t('active_admin.dashboard') }
  6. 1 content title: proc { I18n.t('active_admin.dashboard') } do
  7. div class: 'blank_slate_container', id: 'dashboard_default_message' do
  8. span class: 'blank_slate' do
  9. span I18n.t('active_admin.dashboard_welcome.welcome')
  10. small I18n.t('active_admin.dashboard_welcome.call_to_action')
  11. end
  12. end
  13. end
  14. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)

app/controllers/application_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed.
    
  1. 1 class ApplicationController < ActionController::Base
  2. 1 before_action :user_or_guest_have_order
  3. 1 private
  4. 1 def user_or_guest_have_order
  5. 164 if current_user
  6. 36 session[:order_id] = Order.find_or_create_by(user_id: current_user.id).id
  7. 36 CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
  8. 128 elsif session[:order_id].nil?
  9. 52 session[:order_id] = Order.create.id
  10. 52 CartCleaner.set(wait: 1.week).perform_later(session[:order_id])
  11. end
  12. end
  13. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix)

app/controllers/books_controller.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) 93.33% ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 93.75% >>>>>>> c4adab0 (Featire specs) ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= 100.0% >>>>>>> 752f0c0 (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= 100.0% >>>>>>> 7a02bbe (Featire specs) ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= 93.75% >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD 93.33% >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= 93.75% >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) 93.75% ======= 100.0% >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= 100.0% >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= 100.0% >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= 100.0% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= 93.75% >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 15 relevant lines. 14 lines covered and 1 lines missed. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= 14 relevant lines. 14 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> ee78f39 (Rebased) ======= 15 relevant lines. 14 lines covered and 1 lines missed. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 15 relevant lines. 14 lines covered and 1 lines missed. ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= ======= >>>>>>> df37394 (Featire specs) 14 relevant lines. 14 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 14 relevant lines. 14 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 12 relevant lines. 12 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= 14 relevant lines. 14 lines covered and <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 5507b42 (Featire specs) ======= 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= 12 relevant lines. 12 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= 14 relevant lines. 14 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= 16 relevant lines. 15 lines covered and 1 lines missed. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)
    
  1. 1 class BooksController < ApplicationController
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def index ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 1677b1a (Featire specs) ======= <<<<<<< HEAD ======= ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) PAGINATION_PER_PAGE = 12 >>>>>>> d96cf3b (Featire specs)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) =======
  5. >>>>>>> 752f0c0 (Featire specs) =======
  6. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) def index
  7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  8. >>>>>>> 93bdda9 (Featire specs) 24 =======
  9. ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix)
  10. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) 25 <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  11. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  12. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  13. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs)
  14. 25 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  15. 25 =======
  16. 25 >>>>>>> 9620751 (Featire specs) =======
  17. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  18. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  19. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) =======
  20. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= =======
  21. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= =======
  22. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  23. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  24. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  25. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= =======
  26. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= =======
  27. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  28. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= =======
  29. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) @books_count = Book.count
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  31. =======
  32. >>>>>>> 752f0c0 (Featire specs) =======
  33. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  34. ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix)
  35. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) 25 <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  36. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  37. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  38. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs)
  39. 25 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  40. 25 =======
  41. 25 >>>>>>> 9620751 (Featire specs) =======
  42. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  43. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  44. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) =======
  45. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= =======
  46. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= =======
  47. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  48. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  49. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  50. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= =======
  51. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= =======
  52. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  53. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= =======
  54. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) @categories = Category.all
  55. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  56. 24 =======
  57. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  58. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  59. 25 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  60. 25 =======
  61. 25 >>>>>>> 9620751 (Featire specs) =======
  62. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  63. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  64. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) =======
  65. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  66. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= =======
  67. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  68. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
  69. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> 7c4ea7f (Fix)
  70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs)
  71. =======
  72. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) =======
  73. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) =======
  74. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) =======
  75. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) =======
  76. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  77. >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= =======
  78. 24 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) =======
  79. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) per_page: Constants::PAGINATION_PER_PAGE) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> 7c4ea7f (Fix)
  80. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix)
  81. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 852864e (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books) ======= ======= >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) def index
  82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages)
  83. 24 <<<<<<< HEAD ======= =======
  84. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  85. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= =======
  86. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e50f73e (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  87. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) =======
  88. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  89. 25 =======
  90. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  91. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  92. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  93. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  94. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  95. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= =======
  96. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  97. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
  98. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) =======
  99. 25 >>>>>>> a5d032d (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) @books_count = Book.count
  100. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages)
  101. 24 <<<<<<< HEAD ======= =======
  102. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  103. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= =======
  104. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e50f73e (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  105. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) =======
  106. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  107. 25 =======
  108. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  109. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  110. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  111. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  112. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  113. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= =======
  114. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  115. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= =======
  116. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) =======
  117. 25 >>>>>>> a5d032d (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) @categories = Category.all
  118. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages) >>>>>>> 5c33a07 (Featire specs)
  119. 24 ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages)
  120. 24 =======
  121. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  122. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e50f73e (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  123. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) =======
  124. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  125. 25 =======
  126. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  127. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  128. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  129. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  130. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) =======
  131. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD sorted_books = BookQuery.query(params).paginate(page: params[:page], ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= sorted_books = BookQuery.query(params).paginate(page: params[:page], >>>>>>> a5d032d (Fix)
  132. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  133. =======
  134. 24 >>>>>>> d0dc1f1 (Featire specs) =======
  135. 24 >>>>>>> 752f0c0 (Featire specs) =======
  136. 24 >>>>>>> 4e81ea2 (Featire specs) =======
  137. 24 >>>>>>> 08edf50 (Featire specs) =======
  138. 24 >>>>>>> 7a02bbe (Featire specs) =======
  139. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD per_page: PAGINATION_PER_PAGE) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> b28889f (Fix) per_page: Constants::PAGINATION_PER_PAGE) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> d0dc1f1 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 7a02bbe (Featire specs) ======= per_page: Constants::PAGINATION_PER_PAGE) >>>>>>> a5d032d (Fix)
  140. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix)
  141. 25 <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= @books = BookDecorator.decorate_collection(sorted_books) ======= >>>>>>> cb74525 (Add login registration pages) def index
  142. 25 @books_count = Book.count
  143. 25 @categories = Category.all
  144. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) =======
  145. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) =======
  146. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) =======
  147. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) =======
  148. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= =======
  149. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= =======
  150. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) sorted_books = BookQuery.query(params).paginate(page: params[:page],
  151. <<<<<<< HEAD
  152. =======
  153. >>>>>>> cb74525 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD per_page: PAGINATION_PER_PAGE) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= per_page: Constants::PAGINATION_PER_PAGE)
  154. 25 @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> ee78f39 (Rebased) ======= per_page: PAGINATION_PER_PAGE) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)
  155. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
  156. >>>>>>> 752f0c0 (Featire specs) =======
  157. >>>>>>> 4e81ea2 (Featire specs) =======
  158. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 872e675 (Fix)
  159. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  160. =======
  161. >>>>>>> 752f0c0 (Featire specs) =======
  162. >>>>>>> 4e81ea2 (Featire specs) 24 ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  163. 25 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) =======
  164. 24 >>>>>>> 08edf50 (Featire specs) =======
  165. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  166. 24 <<<<<<< HEAD ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  167. 25 <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  168. 24 <<<<<<< HEAD ======= =======
  169. 25 >>>>>>> df37394 (Featire specs) >>>>>>> 1214e1f (Add login registration pages) =======
  170. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  171. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 551f3c1 (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  172. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= >>>>>>> d96cf3b (Featire specs) @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= @books = BookDecorator.decorate_collection(sorted_books) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
  173. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  174. ======= =======
  175. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  176. ======= >>>>>>> d96cf3b (Featire specs)
  177. >>>>>>> 752f0c0 (Featire specs) =======
  178. >>>>>>> 4e81ea2 (Featire specs) =======
  179. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  180. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  181. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
  182. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  183. =======
  184. >>>>>>> 752f0c0 (Featire specs) =======
  185. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  186. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  187. 24 >>>>>>> 08edf50 (Featire specs) =======
  188. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  189. 25 >>>>>>> aca90e3 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages)
  190. 24 <<<<<<< HEAD ======= =======
  191. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  192. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  193. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e50f73e (Add login registration pages) ======= =======
  194. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> ee78f39 (Rebased) =======
  195. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> cb74525 (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) =======
  196. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  197. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  198. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= =======
  199. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  200. 25 >>>>>>> 730a8ca (Add login registration pages) =======
  201. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  202. 25 >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @books = BookDecorator.decorate_collection(sorted_books) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 752f0c0 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 4e81ea2 (Featire specs) ======= @books = BookQuery.query(params).paginate(page: params[:page], per_page: ApplicationHelper::PAGINATION_PER_PAGE) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  203. <<<<<<< HEAD
  204. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  205. =======
  206. >>>>>>> 752f0c0 (Featire specs) =======
  207. >>>>>>> 4e81ea2 (Featire specs) =======
  208. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
  209. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  210. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= =======
  211. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= =======
  212. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  213. 24 <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= =======
  214. 25 <<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= =======
  215. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= =======
  216. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= =======
  217. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= =======
  218. 25 >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  219. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= ======= =======
  220. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= =======
  221. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= =======
  222. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= <<<<<<< HEAD =======
  223. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  224. 25 >>>>>>> 730a8ca (Add login registration pages) =======
  225. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a624084 (Add login registration pages) =======
  226. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  227. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= =======
  228. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= =======
  229. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) @books = BookDecorator.decorate_collection(sorted_books)
  230. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  231. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) =======
  232. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  233. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57da3ff (Add login registration pages) =======
  234. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  235. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  236. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  237. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= =======
  238. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
  239. 25 >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= =======
  240. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  241. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= =======
  242. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= =======
  243. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) respond_to do |format|
  244. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  245. =======
  246. >>>>>>> 752f0c0 (Featire specs) =======
  247. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  248. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  249. 24 >>>>>>> 08edf50 (Featire specs) =======
  250. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  251. 25 >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  252. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  253. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  254. 24 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  255. 24 >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= =======
  256. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  257. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  258. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  259. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= =======
  260. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs)
  261. 25 =======
  262. 25 >>>>>>> 9620751 (Featire specs) =======
  263. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  264. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  265. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  266. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= =======
  267. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  268. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  269. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  270. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) =======
  271. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= =======
  272. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= =======
  273. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= =======
  274. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs)
  275. 25 =======
  276. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= =======
  277. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= =======
  278. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= =======
  279. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= =======
  280. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= =======
  281. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  282. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= =======
  283. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= =======
  284. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) format.html
  285. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  286. =======
  287. >>>>>>> 752f0c0 (Featire specs) =======
  288. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  289. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  290. 24 >>>>>>> 08edf50 (Featire specs) =======
  291. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  292. 25 >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  293. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  294. 25 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  295. 24 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  296. 24 >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= =======
  297. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  298. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  299. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  300. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= =======
  301. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs)
  302. 25 =======
  303. 25 >>>>>>> 9620751 (Featire specs) =======
  304. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  305. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  306. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  307. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= =======
  308. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  309. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  310. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  311. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) =======
  312. 25 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= =======
  313. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= =======
  314. 25 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= =======
  315. 25 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs)
  316. 25 =======
  317. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= =======
  318. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= =======
  319. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= =======
  320. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= =======
  321. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= =======
  322. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  323. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= =======
  324. 25 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= =======
  325. 25 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) format.json do
  326. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  327. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  328. =======
  329. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  330. >>>>>>> 94841b5 (Featire specs) =======
  331. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  332. >>>>>>> 3b03895 (Featire specs) =======
  333. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  334. >>>>>>> e54deeb (Featire specs) =======
  335. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  336. >>>>>>> 9c0d812 (Featire specs) =======
  337. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  338. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD =======
  339. ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  340. =======
  341. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  342. >>>>>>> 9c0d812 (Featire specs) =======
  343. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  344. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  345. =======
  346. >>>>>>> 752f0c0 (Featire specs) =======
  347. >>>>>>> 4e81ea2 (Featire specs) =======
  348. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  349. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  350. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  351. =======
  352. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= =======
  353. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= =======
  354. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  355. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  356. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  357. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  358. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  359. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  360. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= =======
  361. =======
  362. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  363. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  364. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  365. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  366. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  367. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  368. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  369. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  370. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) 1 render json: {
  371. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  372. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  373. =======
  374. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  375. >>>>>>> 94841b5 (Featire specs) =======
  376. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  377. >>>>>>> 3b03895 (Featire specs) =======
  378. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  379. >>>>>>> e54deeb (Featire specs) =======
  380. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  381. >>>>>>> 9c0d812 (Featire specs) =======
  382. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  383. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD =======
  384. ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  385. =======
  386. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  387. >>>>>>> 9c0d812 (Featire specs) =======
  388. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  389. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  390. =======
  391. >>>>>>> 752f0c0 (Featire specs) =======
  392. >>>>>>> 4e81ea2 (Featire specs) =======
  393. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  394. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  395. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  396. =======
  397. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= =======
  398. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= =======
  399. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  400. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  401. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  402. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  403. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  404. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  405. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= =======
  406. =======
  407. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  408. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  409. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  410. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  411. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  412. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  413. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  414. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  415. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) entries: render_to_string(partial: 'books/index/books', formats: [:html]),
  416. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  417. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  418. =======
  419. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  420. >>>>>>> 94841b5 (Featire specs) =======
  421. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  422. >>>>>>> 3b03895 (Featire specs) =======
  423. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  424. >>>>>>> e54deeb (Featire specs) =======
  425. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  426. >>>>>>> 9c0d812 (Featire specs) =======
  427. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  428. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD =======
  429. ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  430. =======
  431. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  432. >>>>>>> 9c0d812 (Featire specs) =======
  433. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  434. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  435. =======
  436. >>>>>>> 752f0c0 (Featire specs) =======
  437. >>>>>>> 4e81ea2 (Featire specs) =======
  438. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  439. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  440. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  441. =======
  442. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= =======
  443. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= =======
  444. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  445. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  446. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  447. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  448. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  449. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  450. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= =======
  451. =======
  452. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  453. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  454. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  455. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  456. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  457. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  458. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  459. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  460. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) pagination: view_context.will_paginate(@books)
  461. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  462. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  463. =======
  464. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  465. >>>>>>> 94841b5 (Featire specs) =======
  466. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  467. >>>>>>> 3b03895 (Featire specs) =======
  468. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  469. >>>>>>> e54deeb (Featire specs) =======
  470. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  471. >>>>>>> 9c0d812 (Featire specs) =======
  472. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  473. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD =======
  474. ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  475. =======
  476. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  477. >>>>>>> 9c0d812 (Featire specs) =======
  478. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  479. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  480. =======
  481. >>>>>>> 752f0c0 (Featire specs) =======
  482. >>>>>>> 4e81ea2 (Featire specs) =======
  483. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  484. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  485. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  486. =======
  487. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= =======
  488. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= =======
  489. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  490. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  491. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  492. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  493. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  494. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  495. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= =======
  496. =======
  497. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  498. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  499. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  500. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  501. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  502. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  503. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  504. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  505. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD ======= >>>>>>> d6f7da8 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 78d0719 (Featire specs) }
  506. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  507. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  508. =======
  509. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  510. >>>>>>> 94841b5 (Featire specs) =======
  511. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  512. >>>>>>> 3b03895 (Featire specs) =======
  513. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  514. >>>>>>> e54deeb (Featire specs) =======
  515. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  516. >>>>>>> 9c0d812 (Featire specs) =======
  517. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  518. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD =======
  519. ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  520. =======
  521. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  522. >>>>>>> 9c0d812 (Featire specs) =======
  523. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  524. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  525. =======
  526. >>>>>>> 752f0c0 (Featire specs) =======
  527. >>>>>>> 4e81ea2 (Featire specs) =======
  528. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  529. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  530. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  531. =======
  532. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= =======
  533. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= =======
  534. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  535. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  536. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  537. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  538. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  539. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  540. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= =======
  541. =======
  542. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  543. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  544. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  545. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  546. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  547. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  548. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  549. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  550. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) =======
  551. >>>>>>> d6f7da8 (Featire specs) =======
  552. >>>>>>> dacfb20 (Featire specs) =======
  553. >>>>>>> 78d0719 (Featire specs) end
  554. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  555. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  556. =======
  557. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  558. >>>>>>> 94841b5 (Featire specs) =======
  559. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  560. >>>>>>> 3b03895 (Featire specs) =======
  561. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  562. >>>>>>> e54deeb (Featire specs) =======
  563. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  564. >>>>>>> 9c0d812 (Featire specs) =======
  565. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  566. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD =======
  567. ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  568. =======
  569. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  570. >>>>>>> 9c0d812 (Featire specs) =======
  571. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  572. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  573. =======
  574. >>>>>>> 752f0c0 (Featire specs) =======
  575. >>>>>>> 4e81ea2 (Featire specs) =======
  576. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  577. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  578. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  579. =======
  580. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= =======
  581. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= =======
  582. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  583. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  584. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  585. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  586. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  587. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  588. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= =======
  589. =======
  590. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  591. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  592. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  593. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  594. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  595. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  596. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  597. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  598. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) =======
  599. >>>>>>> d6f7da8 (Featire specs) =======
  600. >>>>>>> dacfb20 (Featire specs) =======
  601. >>>>>>> 78d0719 (Featire specs) end
  602. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  603. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  604. =======
  605. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  606. >>>>>>> 94841b5 (Featire specs) =======
  607. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  608. >>>>>>> 3b03895 (Featire specs) =======
  609. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  610. >>>>>>> e54deeb (Featire specs) =======
  611. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  612. >>>>>>> 9c0d812 (Featire specs) =======
  613. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  614. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD =======
  615. ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  616. =======
  617. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  618. >>>>>>> 9c0d812 (Featire specs) =======
  619. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  620. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  621. =======
  622. >>>>>>> 752f0c0 (Featire specs) =======
  623. >>>>>>> 4e81ea2 (Featire specs) =======
  624. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  625. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  626. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  627. =======
  628. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= =======
  629. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= =======
  630. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  631. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  632. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  633. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  634. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  635. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  636. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= =======
  637. =======
  638. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  639. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  640. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  641. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  642. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  643. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  644. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  645. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  646. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) =======
  647. >>>>>>> d6f7da8 (Featire specs) =======
  648. >>>>>>> dacfb20 (Featire specs) =======
  649. >>>>>>> 78d0719 (Featire specs) end
  650. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  651. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  652. =======
  653. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  654. >>>>>>> 94841b5 (Featire specs) =======
  655. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  656. >>>>>>> 3b03895 (Featire specs) =======
  657. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  658. >>>>>>> e54deeb (Featire specs) =======
  659. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  660. >>>>>>> 9c0d812 (Featire specs) =======
  661. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  662. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD =======
  663. ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  664. =======
  665. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  666. >>>>>>> 9c0d812 (Featire specs) =======
  667. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  668. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  669. =======
  670. >>>>>>> 752f0c0 (Featire specs) =======
  671. >>>>>>> 4e81ea2 (Featire specs) =======
  672. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  673. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  674. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  675. =======
  676. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= =======
  677. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= =======
  678. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  679. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  680. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  681. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  682. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  683. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  684. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= =======
  685. =======
  686. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  687. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  688. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  689. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  690. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  691. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  692. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  693. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  694. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) =======
  695. >>>>>>> d6f7da8 (Featire specs) =======
  696. >>>>>>> dacfb20 (Featire specs) =======
  697. >>>>>>> 78d0719 (Featire specs)
  698. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  699. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  700. =======
  701. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  702. >>>>>>> 94841b5 (Featire specs) =======
  703. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  704. >>>>>>> 3b03895 (Featire specs) =======
  705. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  706. >>>>>>> e54deeb (Featire specs) =======
  707. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  708. >>>>>>> 9c0d812 (Featire specs) =======
  709. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  710. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD =======
  711. ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  712. =======
  713. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  714. >>>>>>> 9c0d812 (Featire specs) =======
  715. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  716. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  717. =======
  718. >>>>>>> 752f0c0 (Featire specs) =======
  719. >>>>>>> 4e81ea2 (Featire specs) =======
  720. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  721. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  722. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  723. =======
  724. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= =======
  725. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= =======
  726. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  727. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  728. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  729. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  730. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  731. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  732. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= =======
  733. =======
  734. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  735. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  736. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  737. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  738. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  739. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  740. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  741. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  742. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) =======
  743. >>>>>>> d6f7da8 (Featire specs) =======
  744. >>>>>>> dacfb20 (Featire specs) =======
  745. >>>>>>> 78d0719 (Featire specs) 1 def show
  746. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  747. 11 ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  748. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  749. =======
  750. >>>>>>> 752f0c0 (Featire specs) =======
  751. >>>>>>> 4e81ea2 (Featire specs) =======
  752. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  753. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
  754. 11 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  755. 11 =======
  756. 11 >>>>>>> 9620751 (Featire specs) =======
  757. <<<<<<< HEAD <<<<<<< HEAD =======
  758. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD
  759. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= <<<<<<< HEAD
  760. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  761. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  762. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  763. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= ======= >>>>>>> df37394 (Featire specs)
  764. ======= ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  765. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  766. 7 >>>>>>> 7a02bbe (Featire specs) =======
  767. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  768. 7 >>>>>>> 4552227 (Featire specs) =======
  769. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) =======
  770. 15 >>>>>>> 7c4ea7f (Fix) =======
  771. 7 >>>>>>> d6f7da8 (Featire specs) =======
  772. 7 >>>>>>> dacfb20 (Featire specs) =======
  773. 7 >>>>>>> 78d0719 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD book = Book.find(params[:id]) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= =======
  774. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  775. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  776. 11 >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @book = Book.find(params[:id]).decorate >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  777. =======
  778. >>>>>>> 752f0c0 (Featire specs) =======
  779. >>>>>>> 4e81ea2 (Featire specs) =======
  780. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  781. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= =======
  782. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= =======
  783. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  784. 11 >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD book = Book.find_by(id: params[:id]) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) @book = Book.find(params[:id]).decorate ======= book = Book.find_by(id: params[:id]) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= book = Book.find_by(id: params[:id]) >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD ======= @book = Book.find(params[:id]).decorate ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @book = Book.find(params[:id]).decorate ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) book = Book.find_by(id: params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= book = Book.find_by(id: params[:id]) >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= book = Book.find(params[:id]) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) book = Book.find(params[:id]) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= @book = Book.find_by(id: params[:id]) >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) @book = Book.find_by(id: params[:id]) ======= @book = Book.find(params[:id]).decorate >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= @book = Book.find_by(id: params[:id]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= @book = Book.find(params[:id]).decorate >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= @book = Book.find_by(id: params[:id]) >>>>>>> dacfb20 (Featire specs) ======= @book = Book.find_by(id: params[:id]) >>>>>>> 78d0719 (Featire specs)
  785. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  786. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  787. =======
  788. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  789. >>>>>>> 94841b5 (Featire specs) =======
  790. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  791. >>>>>>> 3b03895 (Featire specs) =======
  792. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  793. >>>>>>> e54deeb (Featire specs) =======
  794. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  795. >>>>>>> 9c0d812 (Featire specs) =======
  796. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  797. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD =======
  798. ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  799. =======
  800. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  801. >>>>>>> 9c0d812 (Featire specs) =======
  802. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  803. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  804. =======
  805. >>>>>>> 752f0c0 (Featire specs) =======
  806. >>>>>>> 4e81ea2 (Featire specs) =======
  807. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  808. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  809. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  810. =======
  811. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= =======
  812. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= =======
  813. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  814. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  815. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  816. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  817. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  818. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  819. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= =======
  820. =======
  821. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  822. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  823. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  824. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  825. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  826. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  827. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  828. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  829. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) =======
  830. >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price)
  831. =======
  832. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= =======
  833. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= =======
  834. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= =======
  835. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= =======
  836. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> e733663 (Fix book_spec decrease quantity and price) =======
  837. >>>>>>> dacfb20 (Featire specs) =======
  838. >>>>>>> 78d0719 (Featire specs)
  839. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  840. 11 ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  841. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  842. =======
  843. >>>>>>> 752f0c0 (Featire specs) =======
  844. >>>>>>> 4e81ea2 (Featire specs) =======
  845. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  846. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
  847. 11 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  848. 11 =======
  849. 11 >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price)
  850. =======
  851. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  852. >>>>>>> 7a02bbe (Featire specs) =======
  853. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  854. >>>>>>> 4552227 (Featire specs) =======
  855. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  856. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  857. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  858. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= ======= >>>>>>> df37394 (Featire specs)
  859. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  860. =======
  861. >>>>>>> 752f0c0 (Featire specs) =======
  862. >>>>>>> 4e81ea2 (Featire specs) =======
  863. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  864. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= =======
  865. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= =======
  866. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  867. 11 >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  868. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  869. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  870. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  871. 11 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  872. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  873. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  874. 15 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) =======
  875. 7 >>>>>>> d6f7da8 (Featire specs) =======
  876. 7 >>>>>>> dacfb20 (Featire specs) =======
  877. 7 >>>>>>> 78d0719 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) if book.nil? ======= redirect_to books_path if @book.nil? >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= if book.nil? >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD if book.nil? >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= if book.nil? >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= redirect_to books_path if @book.nil? >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= if book.nil? >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= redirect_to books_path if @book.nil? >>>>>>> d6f7da8 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> dacfb20 (Featire specs) ======= redirect_to books_path if @book.nil? >>>>>>> 78d0719 (Featire specs)
  878. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD
  879. >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD
  880. >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD
  881. >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD
  882. >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD
  883. >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD
  884. >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD
  885. >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD
  886. >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD
  887. >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD
  888. >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD
  889. >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD
  890. >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD
  891. >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD
  892. >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD
  893. >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD
  894. >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD
  895. >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD
  896. ======= >>>>>>> 93bdda9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= =======
  897. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)
  898. redirect_to books_path
  899. else
  900. 15 <<<<<<< HEAD ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
  901. 15 >>>>>>> a5d032d (Fix) @book = book.decorate
  902. <<<<<<< HEAD
  903. =======
  904. >>>>>>> a5d032d (Fix) end
  905. <<<<<<< HEAD <<<<<<< HEAD
  906. <<<<<<< HEAD ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased)
  907. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
  908. =======
  909. >>>>>>> 752f0c0 (Featire specs) =======
  910. >>>>>>> 4e81ea2 (Featire specs) =======
  911. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  912. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> ee78f39 (Rebased)
  913. redirect_to books_path
  914. else
  915. 11 <<<<<<< HEAD <<<<<<< HEAD ======= @reviews = ReviewDecorator.decorate_collection(Review.where(book_id: book.id).order(created_at: :desc))
  916. 11 >>>>>>> a5d032d (Fix) ======= >>>>>>> ee78f39 (Rebased) @book = book.decorate
  917. <<<<<<< HEAD <<<<<<< HEAD
  918. =======
  919. >>>>>>> a5d032d (Fix) =======
  920. >>>>>>> ee78f39 (Rebased) end
  921. <<<<<<< HEAD <<<<<<< HEAD
  922. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> 93bdda9 (Featire specs) ======= =======
  923. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= =======
  924. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= =======
  925. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= =======
  926. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  927. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= =======
  928. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  929. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  930. <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) =======
  931. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  932. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= =======
  933. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  934. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  935. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= =======
  936. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  937. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  938. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  939. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  940. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  941. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  942. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) =======
  943. >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price)
  944. =======
  945. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= =======
  946. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= =======
  947. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= =======
  948. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= =======
  949. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> e733663 (Fix book_spec decrease quantity and price) =======
  950. >>>>>>> dacfb20 (Featire specs) =======
  951. >>>>>>> 78d0719 (Featire specs) end
  952. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  953. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix)
  954. =======
  955. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  956. >>>>>>> 94841b5 (Featire specs) =======
  957. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  958. >>>>>>> 3b03895 (Featire specs) =======
  959. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  960. >>>>>>> e54deeb (Featire specs) =======
  961. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  962. >>>>>>> 9c0d812 (Featire specs) =======
  963. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  964. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD =======
  965. ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  966. =======
  967. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  968. >>>>>>> 9c0d812 (Featire specs) =======
  969. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  970. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  971. =======
  972. >>>>>>> 752f0c0 (Featire specs) =======
  973. >>>>>>> 4e81ea2 (Featire specs) =======
  974. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  975. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  976. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs)
  977. =======
  978. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= =======
  979. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= =======
  980. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  981. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  982. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  983. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  984. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  985. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  986. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  987. =======
  988. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  989. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  990. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  991. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  992. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  993. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  994. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  995. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  996. end

app/controllers/coupons_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 class CouponsController < ApplicationController
  3. 1 def find
  4. 4 coupon = Coupon.find_by(code: params[:code])
  5. 4 order = Order.find(session[:order_id])
  6. 4 respond_to do |format|
  7. 4 format.json do
  8. 4 render json: CouponService.find_coupon(params, order, coupon)
  9. end
  10. end
  11. end
  12. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs)
  13. =======
  14. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  15. >>>>>>> 7a02bbe (Featire specs) =======
  16. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  17. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD =======
  18. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d7fadcd (Featire specs) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 78d0719 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price)
  19. =======
  20. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  21. >>>>>>> 7a02bbe (Featire specs) =======
  22. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  23. >>>>>>> 4552227 (Featire specs) =======
  24. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 5f76842 (Featire specs) <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> aa4fb26 (Add sort orders) end

app/controllers/home_controller.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 class HomeController < ApplicationController
  2. 1 def index
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
  4. 13 =======
  5. 3 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  6. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  7. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) =======
  8. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) =======
  9. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  10. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  11. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) =======
  12. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  13. 13 >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  14. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  15. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0b5b269 (Fix) =======
  16. 13 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) =======
  17. 13 >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= =======
  18. 18 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  19. 13 >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  20. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  21. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  22. 13 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= =======
  23. 18 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
  24. 18 =======
  25. 3 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= =======
  26. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= =======
  27. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= =======
  28. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= =======
  29. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= =======
  30. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= =======
  31. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= =======
  32. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= =======
  33. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= =======
  34. 18 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> e5752db (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 5506bd0 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 20256f8 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= >>>>>>> df37394 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= >>>>>>> 715fac2 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= >>>>>>> 3dc272d (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price) @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 78d0719 (Featire specs) ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= @catalog = Book.order('created_at DESC').first(3) >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= @catalog = BookDecorator.decorate_collection(Book.order('created_at DESC').first(3)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= @catalog = BookDecorator.decorate_collection(Book.order(created_at: :desc).first(Constants::CATALOG_BOOK_COUNT)) >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
  36. 13 =======
  37. 3 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  38. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  39. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) =======
  40. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) =======
  41. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  42. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  43. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) =======
  44. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  45. 13 >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  46. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  47. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0b5b269 (Fix) =======
  48. 13 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) =======
  49. 13 >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= =======
  50. 18 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  51. 13 >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  52. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  53. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  54. 13 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= =======
  55. 18 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
  56. 18 =======
  57. 3 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= =======
  58. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= =======
  59. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= =======
  60. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= =======
  61. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= =======
  62. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= =======
  63. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= =======
  64. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= =======
  65. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= =======
  66. 18 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) @best_sellers = best_sellers
  67. end
  68. 1 private
  69. 1 def best_sellers
  70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price)
  71. 13 =======
  72. 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) =======
  73. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 113da87 (Featire specs) =======
  74. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) =======
  75. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) =======
  76. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  77. 3 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  78. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) =======
  79. 13 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  80. 13 >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  81. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  82. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0b5b269 (Fix) =======
  83. 13 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) =======
  84. 13 >>>>>>> 836a973 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  85. 18 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  86. 13 >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  87. 3 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  88. 3 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  89. 13 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= =======
  90. 18 >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) BookDecorator.decorate_collection(Book.first(4)) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= BookDecorator.decorate_collection(Book.first(4)) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(4)) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> e5752db (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 9c0d812 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= BookDecorator.decorate_collection(Book.first(4)) ======= >>>>>>> df37394 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(4)) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD ======= BookDecorator.decorate_collection(Book.first(4)) ======= >>>>>>> 715fac2 (Featire specs) ======= BookDecorator.decorate_collection(Book.first(4)) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD ======= BookDecorator.decorate_collection(Book.first(4)) ======= >>>>>>> 3dc272d (Featire specs) ======= BookDecorator.decorate_collection(Book.first(4)) ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD BookDecorator.decorate_collection(Book.first(4)) ======= Book.first(4) >>>>>>> 752f0c0 (Featire specs) ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) ======= Book.first(4) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= Book.first(4) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= Book.first(4) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= Book.first(4) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= Book.first(4) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 64d4167 (Featire specs) ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 13fd74f (Featire specs) ======= ======= Book.first(4) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> a038b16 (Featire specs) ======= ======= Book.first(4) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> d7fadcd (Featire specs) ======= ======= Book.first(4) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(4)) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= BookDecorator.decorate_collection(Book.first(Constants::BEST_SELLER_COUNT)) >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix)
  91. end
  92. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 75be480 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
======= ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix)

app/controllers/order_books_controller.rb

82.86% lines covered

35 relevant lines. 29 lines covered and 6 lines missed.
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 require_relative '../services/book_service'
  3. 1 class OrderBooksController < ApplicationController
  4. 1 before_action :update_order_last_action
  5. 1 def add_to_order
  6. 4 product = OrderBook.new(order_id: params[:order_id], book_id: params[:book_id], quantity: params[:quantity])
  7. 4 respond_to do |format|
  8. 4 format.html
  9. 4 format.json do
  10. 4 if product.save
  11. 4 render json: { notice: 'Added!' }
  12. else
  13. render json: { notice: 'Error!' }
  14. end
  15. end
  16. end
  17. end
  18. 1 def delete_product
  19. 1 product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
  20. 1 if product.destroy
  21. 1 redirect_to orders_path, notice: I18n.t('order.messages.delete')
  22. else
  23. redirect_to orders_path, alert: I18n.t('order.errors.error_delete')
  24. end
  25. end
  26. 1 def update_quantity
  27. 2 product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
  28. 2 book = Book.find(params[:book_id])
  29. 2 order = Order.find(params[:order_id])
  30. 2 coupon = Coupon.find_by(code: params[:code])
  31. 2 respond_to do |format|
  32. 2 format.html
  33. 2 format.json do
  34. 2 render json: BookService.quantity_update(params, product, order, book, coupon)
  35. end
  36. end
  37. end
  38. 1 def update
  39. product = OrderBook.find_by(order_id: session[:order_id], book_id: params[:book_id])
  40. product.update(quantity: params[:quantity])
  41. redirect_to orders_path
  42. end
  43. 1 private
  44. 1 def order_item_params
  45. params.permit(%i[book_id quantity order_id])
  46. end
  47. 1 def update_order_last_action
  48. 7 Order.find(session[:order_id]).update(last_action: DateTime.now)
  49. end
  50. end

app/controllers/orders_controller.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 class OrdersController < ApplicationController
  2. 1 def index
  3. 12 @cart = Order.find(session[:order_id]).decorate
  4. end
  5. 1 def show
  6. 5 if current_user
  7. 2 @order = Order.find_by(id: session[:order_id], user_id: current_user.id).decorate
  8. 2 render 'orders/show'
  9. else
  10. 3 redirect_to new_checkout_path
  11. end
  12. end
  13. end
>>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> eaef86a (Fix)

app/controllers/reviews_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 if @review.save
  6. 1 redirect_to book_path(@review.book), notice: I18n.t('review.success')
  7. else
  8. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  9. end
  10. end
  11. 1 private
  12. 1 def review_params
  13. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  14. end
  15. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true)
>>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD <<<<<<< HEAD

app/controllers/order_books_controller.rb

80.65% lines covered

31 relevant lines. 25 lines covered and 6 lines missed.
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 require_relative '../services/book_service'
  3. 1 class OrderBooksController < ApplicationController
  4. 1 before_action :update_order_last_action
  5. 1 def add_to_order
  6. 4 product = OrderBook.new(order_id: params[:order_id], book_id: params[:book_id], quantity: params[:quantity])
  7. 4 respond_to do |format|
  8. 4 format.html
  9. 4 format.json do
  10. 4 if product.save
  11. 4 render json: { notice: 'Added!' }
  12. else
  13. render json: { notice: 'Error!' }
  14. end
  15. end
  16. end
  17. end
  18. 1 def delete_product
  19. product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
  20. if product.destroy
  21. redirect_to orders_path, notice: I18n.t('order.messages.delete')
  22. else
  23. redirect_to orders_path, alert: I18n.t('order.errors.error_delete')
  24. end
  25. end
  26. 1 def update_quantity
  27. 2 product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
  28. 2 book = Book.find(params[:book_id])
  29. 2 order = Order.find(params[:order_id])
  30. 2 coupon = Coupon.find_by(code: params[:code])
  31. 2 respond_to do |format|
  32. 2 format.html
  33. 2 format.json do
  34. 2 render json: BookService.quantity_update(params, product, order, book, coupon)
  35. end
  36. end
  37. end
  38. 1 private
  39. 1 def order_item_params
  40. params.permit(%i[book_id quantity order_id])
  41. end
  42. 1 def update_order_last_action
  43. 6 Order.find(session[:order_id]).update(last_action: DateTime.now)
  44. end
  45. end

app/controllers/orders_controller.rb

======= ======= =======
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true)

app/decorators/author_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix)

app/decorators/author_decorator.rb

<<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3dc272d (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> 3dc272d (Featire specs)

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
  6. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  7. end
  8. 1 private
  9. 1 def review_params
  10. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  11. end
  12. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true)
=======
>>>>>>> 02a399d (Manifest_cache true)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= =======

app/helpers/application_helper.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======

app/decorators/author_decorator.rb

>>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= =======

app/decorators/author_decorator.rb

>>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) =======

app/decorators/author_decorator.rb

>>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD class OrdersController < ApplicationController ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) class AuthorDecorator < Draper::Decorator <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= class AuthorDecorator < Draper::Decorator >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD class AuthorDecorator < Draper::Decorator ======= module ApplicationHelper >>>>>>> 752f0c0 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> bd8bda4 (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) class AuthorDecorator < Draper::Decorator <<<<<<< HEAD ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= ======= module ApplicationHelper >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= module ApplicationHelper >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= class AuthorDecorator < Draper::Decorator >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD def index
  3. 7 @cart = Order.find(session[:order_id]).decorate
  4. end
  5. 1 def registration_without_password; end
  6. end
>>>>>>> 7c4ea7f (Fix)

app/controllers/reviews_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 if @review.save
  6. 1 redirect_to book_path(@review.book), notice: I18n.t('review.success')
  7. else
  8. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  9. end
  10. end
  11. 1 private
  12. 1 def review_params
  13. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  14. end
  15. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true)

app/decorators/author_decorator.rb

>>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 96394f1 (Featire specs) ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) =======

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
  6. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  7. end
  8. 1 private
  9. 1 def review_params
  10. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  11. end
  12. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)

app/controllers/order_books_controller.rb

82.86% lines covered

35 relevant lines. 29 lines covered and 6 lines missed.
    
  1. 1 require_relative '../services/coupon_service'
  2. 1 require_relative '../services/book_service'
  3. 1 class OrderBooksController < ApplicationController
  4. 1 before_action :update_order_last_action
  5. 1 def add_to_order
  6. 4 product = OrderBook.new(order_id: params[:order_id], book_id: params[:book_id], quantity: params[:quantity])
  7. 4 respond_to do |format|
  8. 4 format.html
  9. 4 format.json do
  10. 4 if product.save
  11. 4 render json: { notice: 'Added!' }
  12. else
  13. render json: { notice: 'Error!' }
  14. end
  15. end
  16. end
  17. end
  18. 1 def delete_product
  19. 1 product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
  20. 1 if product.destroy
  21. 1 redirect_to order_path(session[:order_id]), notice: I18n.t('order.messages.delete')
  22. else
  23. redirect_to order_path(session[:order_id]), alert: I18n.t('order.errors.error_delete')
  24. end
  25. end
  26. 1 def update_quantity
  27. 2 product = OrderBook.find_by(order_id: params[:order_id], book_id: params[:book_id])
  28. 2 book = Book.find(params[:book_id])
  29. 2 order = Order.find(params[:order_id])
  30. 2 coupon = Coupon.find_by(code: params[:code])
  31. 2 respond_to do |format|
  32. 2 format.html
  33. 2 format.json do
  34. 2 render json: BookService.quantity_update(params, product, order, book, coupon)
  35. end
  36. end
  37. end
  38. 1 def update
  39. product = OrderBook.find_by(order_id: session[:order_id], book_id: params[:book_id])
  40. product.update(quantity: params[:quantity])
  41. redirect_to orders_path
  42. end
  43. 1 private
  44. 1 def order_item_params
  45. params.permit(%i[book_id quantity order_id])
  46. end
  47. 1 def update_order_last_action
  48. 7 Order.find(session[:order_id]).update(updated_at: DateTime.now)
  49. end
  50. end

app/controllers/orders_controller.rb

33.33% lines covered

33 relevant lines. 11 lines covered and 22 lines missed.
    
  1. 1 require_relative '../queries/order_query'
  2. 1 class OrdersController < ApplicationController
  3. 1 before_action :authenticate_user!, only: %i[update index]
  4. 1 def show
  5. 13 @cart = Order.find(session[:order_id]).decorate
  6. end
  7. 1 def index
  8. @orders = OrderQuery.query(params, current_user)
  9. end
  10. 1 def update
  11. order = Order.find(params[:id])
  12. if params[:order][:delivery_id]
  13. update_delivery_method(params[:order][:delivery_id], order)
  14. elsif params[:order][:address_id]
  15. update_address(params[:order][:address_id], order)
  16. elsif params[:order][:billing] || params[:order][:shipping]
  17. update_user_address(params[:order])
  18. end
  19. end
  20. 1 private
  21. 1 def update_delivery_method(delivery_id, order)
  22. method = Delivery.find(delivery_id)
  23. redirect_to checkout_path(step: :delivery), alert: 'No method found!' if order.nil? && method.nil?
  24. if order.update(delivery_id: method.id)
  25. redirect_to checkout_path(step: :payment)
  26. else
  27. redirect_to checkout_path(step: :delivery)
  28. end
  29. end
  30. 1 def update_address(address_id, order)
  31. address = Address.find(address_id)
  32. redirect_to checkout_path(step: :address), alert: 'No address found!' if order.nil? && address.nil?
  33. if order.update(address_id: address.id)
  34. redirect_to checkout_path(step: :delivery)
  35. else
  36. redirect_to checkout_path(step: :address)
  37. end
  38. end
  39. 1 def update_user_address(permitted_params)
  40. if permitted_params[:shipping].nil?
  41. current_user.billing.update(permitted_params[:billing])
  42. else
  43. current_user.shipping.update(permitted_params[:shipping])
  44. end
  45. redirect_to checkout_path(step: :address)
  46. end
  47. end
>>>>>>> 7c4ea7f (Fix)

app/controllers/reviews_controller.rb

100.0% lines covered

10 relevant lines. 10 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 if @review.save
  6. 1 redirect_to book_path(@review.book), notice: I18n.t('review.success')
  7. else
  8. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  9. end
  10. end
  11. 1 private
  12. 1 def review_params
  13. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  14. end
  15. end

app/controllers/users_controller.rb

80.95% lines covered

21 relevant lines. 17 lines covered and 4 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if session[:previous_path].eql?('/checkout')
  10. redirect_to checkout_path(step: 'address'), notice: I18n.t('settings.message.update') if updated? update_user
  11. redirect_to checkout_path(step: 'address'), alert: I18n.t('settings.erorr.error') unless updated? update_user
  12. else
  13. 5 redirect_to edit_user_path, notice: I18n.t('settings.message.update') if updated? update_user
  14. 5 redirect_to edit_user_path, notice: I18n.t('settings.error.error') unless updated? update_user
  15. end
  16. end
  17. 1 def destroy
  18. current_user.destroy
  19. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  20. end
  21. 1 private
  22. 1 def updated?(update_user)
  23. 10 return true if update_user.success?
  24. 2 false
  25. end
  26. 1 def permitted_params
  27. 5 params.permit(
  28. user: %i[password current_password password_confirmation email],
  29. billing: %i[first_name last_name address city zip country phone],
  30. shipping: %i[first_name last_name address city zip country phone]
  31. )
  32. end
  33. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true)
=======
>>>>>>> bd8bda4 (Manifest_cache true) =======
>>>>>>> aa7b40c (Manifest_cache true)

app/decorators/author_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======

app/helpers/application_helper.rb

>>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> b8aab1a (Manifest_cache true)
<<<<<<< HEAD <<<<<<< HEAD ======= =======
>>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d8298a1 (Manifest_cache true)

app/decorators/author_decorator.rb

>>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix)

app/decorators/author_decorator.rb

>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased)

app/controllers/reviews_controller.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 class ReviewsController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def create
  4. 2 @review = Review.new(review_params)
  5. 2 return redirect_to book_path(@review.book), notice: I18n.t('review.success') if @review.save
  6. 1 redirect_to book_path(@review.book), alert: @review.errors.full_messages.join(', ')
  7. end
  8. 1 private
  9. 1 def review_params
  10. 2 params.permit(:title, :body, :book_id, :user_id, :rating, :verified)
  11. end
  12. end

app/controllers/users_controller.rb

86.67% lines covered

15 relevant lines. 13 lines covered and 2 lines missed.
    
  1. 1 class UsersController < ApplicationController
  2. 1 before_action :authenticate_user!
  3. 1 def edit
  4. 9 @user_billing = Billing.find_or_create_by(user_id: current_user.id)
  5. 9 @user_shipping = Shipping.find_or_create_by(user_id: current_user.id)
  6. end
  7. 1 def update
  8. 5 update_user = UserUpdate.call(permitted_params: permitted_params, current_user: current_user)
  9. 5 if update_user.success?
  10. 4 redirect_to edit_user_path, notice: I18n.t('settings.message.update')
  11. else
  12. 1 redirect_to edit_user_path, alert: I18n.t('settings.error.error')
  13. end
  14. end
  15. 1 def destroy
  16. current_user.destroy
  17. redirect_to root_path, notice: I18n.t('devise.registrations.destroyed')
  18. end
  19. 1 def permitted_params
  20. 5 params.permit(
  21. user: %i[password current_password password_confirmation email],
  22. billing: %i[first_name last_name address city zip country phone],
  23. shipping: %i[first_name last_name address city zip country phone]
  24. )
  25. end
  26. end
<<<<<<< HEAD ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price)
======= >>>>>>> 02a399d (Manifest_cache true) =======
>>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= =======
>>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= =======
>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= =======
>>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased)
>>>>>>> bebaea7 (Rebased)

app/decorators/author_decorator.rb

>>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

app/decorators/author_decorator.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> 2956182 (Manifest_cache true) =======

app/decorators/author_decorator.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) =======

app/helpers/application_helper.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) =======

app/decorators/author_decorator.rb

>>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 1a9aba9 (Fix) =======

app/decorators/author_decorator.rb

>>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= =======

app/decorators/author_decorator.rb

>>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 8577deb (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 8577deb (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) >>>>>>> e2d040a (Manifest_cache true) class AuthorDecorator < Draper::Decorator <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= class AuthorDecorator < Draper::Decorator >>>>>>> df37394 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 5ce1a6d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD class AuthorDecorator < Draper::Decorator ======= module ApplicationHelper >>>>>>> 752f0c0 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> bd8bda4 (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) ======= class AuthorDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD class AuthorDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b15044a (Manifest_cache true) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) class AuthorDecorator < Draper::Decorator <<<<<<< HEAD ======= module ApplicationHelper >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= module ApplicationHelper >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= module ApplicationHelper >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= module ApplicationHelper >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= ======= module ApplicationHelper >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= class AuthorDecorator < Draper::Decorator >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) >>>>>>> 307ac6e (Manifest_cache true) delegate_all ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4552227 (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) delegate_all
  3. 1 def full_name
  4. 3 "#{first_name} #{last_name}"
  5. end
  6. end

app/decorators/book_decorator.rb

100.0% lines covered

<<<<<<< HEAD 10 relevant lines. 10 lines covered and 0 lines missed.
    
  1. 1 class BookDecorator < Draper::Decorator
  2. 1 decorates_association :authors >>>>>>> 998f08d (Manifest_cache true)
  3. <<<<<<< HEAD
  4. =======
  5. 1 decorates_association :categories
  6. >>>>>>> 4552227 (Featire specs)
  7. <<<<<<< HEAD
  8. =======
  9. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD def full_name
  10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  11. 2 ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) <<<<<<< HEAD
  12. 3 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  13. 2 ======= <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true)
  14. ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true)
  15. ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true)
  16. ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price)
  17. 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) =======
  18. 3 >>>>>>> b8aab1a (Manifest_cache true) >>>>>>> 04108c4 (Manifest_cache true) =======
  19. 2 >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> d8298a1 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 3c386ca (Manifest_cache true) =======
  20. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 5f76842 (Featire specs)
  21. 2 >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) =======
  22. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  23. 2 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) =======
  24. 2 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) =======
  25. 2 >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) =======
  26. 3 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======
  27. 3 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> a77cc8a (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) =======
  28. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) =======
  29. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) =======
  30. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) =======
  31. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= =======
  32. 2 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 5f76842 (Featire specs) =======
  33. 3 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) =======
  34. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> ea0650c (Featire specs) ======= =======
  35. 3 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) =======
  36. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 39467b5 (Manifest_cache true) ======= =======
  37. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) =======
  38. 2 >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= ======= =======
  39. 2 >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= =======
  40. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  41. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= ======= >>>>>>> 864f339 (Featire specs) =======
  42. 3 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= =======
  43. 2 >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= =======
  44. 3 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) >>>>>>> 7718476 (Fix book_spec decrease quantity and price) "#{first_name} #{last_name}" ======= DESCRIPTION_LENGTH = 25 >>>>>>> 4552227 (Featire specs)
  45. <<<<<<< HEAD end
  46. end

app/decorators/book_decorator.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 90.0% ======= <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) >>>>>>> 7718476 (Fix book_spec decrease quantity and price) 100.0% ======= 90.0% >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> d8298a1 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b746b60 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= 90.0% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= 90.0% >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= 90.0% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= 90.0% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= 100.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) ======= 90.0% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) ======= 66.67% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) ======= 100.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 0b5b269 (Fix) ======= 100.0% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= 90.0% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 49e3b70 (Fix) ======= 100.0% >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= 90.0% >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= ======= ======= >>>>>>> 3b839af (Manifest_cache true) ======= 90.0% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= 66.67% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= 100.0% >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= 100.0% >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= 90.0% >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 2956182 (Manifest_cache true) >>>>>>> e2d040a (Manifest_cache true) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 12 relevant lines. 12 lines covered and 0 lines missed. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) 10 relevant lines. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 9 lines covered and 1 lines missed. ======= <<<<<<< HEAD 10 lines covered and 0 lines missed. ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 9 lines covered and 1 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> aa7b40c (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) ======= 10 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= 10 relevant lines. 9 lines covered and 1 lines missed. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= 12 relevant lines. <<<<<<< HEAD 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= 12 relevant lines. <<<<<<< HEAD 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) 12 relevant lines. 12 lines covered and 0 lines missed. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= 10 relevant lines. 9 lines covered and 1 lines missed. <<<<<<< HEAD >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= 12 relevant lines. <<<<<<< HEAD 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 39467b5 (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= 10 relevant lines. 9 lines covered and 1 lines missed. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= ======= >>>>>>> 94d9078 (Manifest_cache true) ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= ======= >>>>>>> 2956182 (Manifest_cache true) ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) 12 relevant lines. 12 lines covered and ======= 10 relevant lines. <<<<<<< HEAD 10 lines covered and >>>>>>> 7375d4b (Manifest_cache true) 0 lines missed. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= 9 lines covered and 1 lines missed. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= 12 relevant lines. <<<<<<< HEAD 8 lines covered and 4 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= 12 lines covered and 0 lines missed. >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= ======= 10 relevant lines. 9 lines covered and 1 lines missed. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD require 'monetize' ======= class BookDecorator < Draper::Decorator >>>>>>> cde4834 (Manifest_cache true) ======= require 'monetize' >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 587ce47 (Manifest_cache true) require 'monetize' ======= class BookDecorator < Draper::Decorator >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= require 'monetize' >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) require 'monetize' ======= class BookDecorator < Draper::Decorator >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= require 'monetize' >>>>>>> 49e3b70 (Fix) ======= require 'monetize' ======= class BookDecorator < Draper::Decorator >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d8298a1 (Manifest_cache true) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> bdea3aa (Manifest_cache true) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 07682bd (Manifest_cache true) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> e2d040a (Manifest_cache true) ======= require 'monetize' >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  3. =======
  4. 1 ======= ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true)
  5. >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true)
  6. =======
  7. >>>>>>> b459807 (Manifest_cache true) =======
  8. >>>>>>> caaaa41 (Manifest_cache true) =======
  9. >>>>>>> ed97c39 (Manifest_cache true) =======
  10. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) =======
  11. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) =======
  12. >>>>>>> d52ad35 (Rebased) =======
  13. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) =======
  14. >>>>>>> 49e8a6c (Rebased) =======
  15. >>>>>>> 836a973 (Rebased) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) =======
  16. >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true)
  17. =======
  18. >>>>>>> b746b60 (Manifest_cache true) =======
  19. >>>>>>> d8298a1 (Manifest_cache true) =======
  20. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) =======
  21. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) =======
  22. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 587ce47 (Manifest_cache true) =======
  23. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 39467b5 (Manifest_cache true) =======
  24. 1 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) =======
  25. >>>>>>> 1ac6be1 (Fix) =======
  26. 1 >>>>>>> cde4834 (Manifest_cache true) =======
  27. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) =======
  28. >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) =======
  29. >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) =======
  30. >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) decorates_association :authors <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) >>>>>>> aa7b40c (Manifest_cache true) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> ed97c39 (Manifest_cache true) ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 2956182 (Manifest_cache true) >>>>>>> e2d040a (Manifest_cache true) ======= decorates_association :authors >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bdea3aa (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e2d040a (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> d7fadcd (Featire specs) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= decorates_association :authors >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= decorates_association :authors >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= decorates_association :authors >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= ======= decorates_association :authors >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= ======= decorates_association :authors >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= ======= decorates_association :authors >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  31. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) decorates_association :categories ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD decorates_association :categories ======= PAGINATION_PER_PAGE = 12 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0832698 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 2956182 (Manifest_cache true) >>>>>>> e2d040a (Manifest_cache true) class BookDecorator < Draper::Decorator >>>>>>> 1bfc7a6 (Manifest_cache true) ======= ======= >>>>>>> 3dc272d (Featire specs) ======= class BookDecorator < Draper::Decorator >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) decorates_association :categories >>>>>>> bd8bda4 (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4e81ea2 (Featire specs) ======= decorates_association :categories >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) ======= class BookDecorator < Draper::Decorator ======= decorates_association :categories >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= class BookDecorator < Draper::Decorator >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= decorates_association :categories >>>>>>> cde4834 (Manifest_cache true) ======= PAGINATION_PER_PAGE = 12 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) class BookDecorator < Draper::Decorator >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased)
  32. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  33. >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased)
  34. 1 decorates_association :authors
  35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) =======
  36. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased)
  37. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  38. =======
  39. >>>>>>> ee78f39 (Rebased) =======
  40. >>>>>>> 836a973 (Rebased) =======
  41. >>>>>>> cde4834 (Manifest_cache true) =======
  42. >>>>>>> 1577aeb (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD class BookDecorator < Draper::Decorator ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) class BookDecorator < Draper::Decorator ======= PAGINATION_PER_PAGE = 12 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) class BookDecorator < Draper::Decorator ======= decorates_association :categories <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> bf554f4 (Rebased) >>>>>>> 078304c (Rebased) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= ======= decorates_association :categories >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= decorates_association :categories >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= ======= decorates_association :categories >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= decorates_association :categories >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= ======= class BookDecorator < Draper::Decorator ======= decorates_association :categories >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) class BookDecorator < Draper::Decorator ======= decorates_association :categories >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= decorates_association :categories >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= decorates_association :categories >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= ======= decorates_association :categories >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= PAGINATION_PER_PAGE = 12 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= decorates_association :categories >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= class BookDecorator < Draper::Decorator ======= decorates_association :categories >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= ======= decorates_association :categories >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= decorates_association :categories >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= ======= decorates_association :categories >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= class BookDecorator < Draper::Decorator >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  43. 1 decorates_association :authors
  44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d780a52 (Rebased) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 1a9aba9 (Fix)
  45. 1 <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) def self.collection_decorator_class
  46. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages)
  47. ======= <<<<<<< HEAD
  48. 30 =======
  49. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) =======
  50. >>>>>>> bd8bda4 (Manifest_cache true) =======
  51. >>>>>>> aa7b40c (Manifest_cache true) =======
  52. 31 >>>>>>> 1214e1f (Add login registration pages) =======
  53. >>>>>>> 183b6c5 (Manifest_cache true) =======
  54. 30 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  55. 56 >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 27ceb6f (Add login registration pages) ======= =======
  56. 31 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======
  57. 56 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> bebaea7 (Rebased) =======
  58. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> eaef86a (Fix) =======
  59. 58 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 3fef583 (Manifest_cache true) =======
  60. 58 ======= <<<<<<< HEAD
  61. 30 =======
  62. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 49e3b70 (Fix) =======
  63. 68 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) =======
  64. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= =======
  65. 68 ======= <<<<<<< HEAD
  66. 30 =======
  67. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= =======
  68. 68 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) PaginatingDecorator
  69. <<<<<<< HEAD <<<<<<< HEAD
  70. =======
  71. >>>>>>> cde4834 (Manifest_cache true) end
  72. <<<<<<< HEAD
  73. ======= ======= >>>>>>> 1577aeb (Rebased)
  74. >>>>>>> cde4834 (Manifest_cache true) end
  75. <<<<<<< HEAD <<<<<<< HEAD
  76. =======
  77. >>>>>>> cde4834 (Manifest_cache true) =======
  78. >>>>>>> 1577aeb (Rebased) 1 delegate_all
  79. <<<<<<< HEAD <<<<<<< HEAD
  80. =======
  81. >>>>>>> cde4834 (Manifest_cache true) =======
  82. >>>>>>> 1577aeb (Rebased)
  83. <<<<<<< HEAD <<<<<<< HEAD
  84. =======
  85. >>>>>>> cde4834 (Manifest_cache true) =======
  86. >>>>>>> 1577aeb (Rebased) 1 def authors_names
  87. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages)
  88. 1 ======= <<<<<<< HEAD
  89. 89 =======
  90. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) =======
  91. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
  92. 1 >>>>>>> aa7b40c (Manifest_cache true) =======
  93. 90 >>>>>>> 1214e1f (Add login registration pages) =======
  94. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
  95. 89 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  96. 101 >>>>>>> aca90e3 (Rebased) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 27ceb6f (Add login registration pages) ======= =======
  97. 90 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======
  98. 101 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> bebaea7 (Rebased) =======
  99. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> eaef86a (Fix) =======
  100. 105 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1a9aba9 (Fix) =======
  101. 109 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 3fef583 (Manifest_cache true) =======
  102. 109 =======
  103. 109 >>>>>>> b8aab1a (Manifest_cache true) ======= <<<<<<< HEAD
  104. 89 =======
  105. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 49e3b70 (Fix) =======
  106. 109 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) =======
  107. 1 >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= =======
  108. 109 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) authors.map(&:full_name).join(', ')
  109. <<<<<<< HEAD <<<<<<< HEAD
  110. =======
  111. >>>>>>> cde4834 (Manifest_cache true) end
  112. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  113. ======= ======= >>>>>>> 1577aeb (Rebased)
  114. >>>>>>> cde4834 (Manifest_cache true) end
  115. <<<<<<< HEAD <<<<<<< HEAD
  116. =======
  117. >>>>>>> cde4834 (Manifest_cache true) 1 ======= ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 49e3b70 (Fix)
  118. >>>>>>> 1577aeb (Rebased)
  119. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  120. 12 =======
  121. 8 >>>>>>> ee78f39 (Rebased) =======
  122. >>>>>>> 49e8a6c (Rebased) =======
  123. 12 >>>>>>> 872e675 (Fix) =======
  124. 8 >>>>>>> 836a973 (Rebased) =======
  125. >>>>>>> 078304c (Rebased) =======
  126. 12 >>>>>>> d15fe1d (Fix) <<<<<<< HEAD ======= def categories_names
  127. 12 >>>>>>> 1577aeb (Rebased) categories.pluck(:name).join(', ')
  128. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased)
  129. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased)
  130. 1 def price <<<<<<< HEAD ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> ee78f39 (Rebased)
  131. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased)
  132. 121 =======
  133. >>>>>>> 49e8a6c (Rebased) Money.new(price_cents)
  134. <<<<<<< HEAD =======
  135. >>>>>>> d780a52 (Rebased) ======= >>>>>>> ee78f39 (Rebased) end
  136. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> f764a87 (Fix book_spec decrease quantity and price) =======
  137. 1 def price
  138. ======= >>>>>>> 872e675 (Fix)
  139. 125 =======
  140. 144 >>>>>>> 1d59aaa (Fix) =======
  141. 143 >>>>>>> 851b4c0 (Fix) =======
  142. >>>>>>> bebaea7 (Rebased) =======
  143. 125 >>>>>>> eaef86a (Fix) =======
  144. 144 >>>>>>> 1a9aba9 (Fix) =======
  145. 143 >>>>>>> 4f1a459 (Fix) =======
  146. 144 >>>>>>> 49e3b70 (Fix) =======
  147. 145 >>>>>>> aa4fb26 (Add sort orders) Money.new(price_cents)
  148. end
  149. >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= =======

app/decorators/order_book_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 require 'monetize' ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased)
  2. <<<<<<< HEAD <<<<<<< HEAD
  3. 1 class OrderBookDecorator < Draper::Decorator
  4. 1 delegate_all
  5. =======
  6. >>>>>>> 836a973 (Rebased) =======
  7. >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased)
  8. <<<<<<< HEAD
  9. 1 def total_price
  10. 8 Money.new(book.price_cents * quantity)
  11. end
  12. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) =======
  13. ======= >>>>>>> 1577aeb (Rebased)
  14. 1 def price
  15. <<<<<<< HEAD
  16. 144 =======
  17. 121 >>>>>>> 1577aeb (Rebased) Money.new(price_cents)
  18. end
  19. <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 081d138 (Checkout Add CreditCard Address Delivery method) ======= =======

app/decorators/delivery_decorator.rb

75.0% lines covered

4 relevant lines. 3 lines covered and 1 lines missed.
    
  1. 1 class DeliveryDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def price
  4. Money.new(price_cents)
  5. end
  6. end
>>>>>>> 708d0c9 (Checkout Add CreditCard Address Delivery method)

app/decorators/order_book_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 require 'monetize'
  2. 1 class OrderBookDecorator < Draper::Decorator
  3. 1 delegate_all
  4. 1 def total_price
  5. 10 Money.new(book.price_cents * quantity)
  6. end
  7. end
<<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1a9aba9 (Fix)

app/decorators/order_decorator.rb

78.57% lines covered

14 relevant lines. 11 lines covered and 3 lines missed.
    
  1. 1 require 'monetize'
  2. 1 class OrderDecorator < Draper::Decorator
  3. 1 delegate_all
  4. 1 def order_price(coupon = 0, delivery = 0)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  6. 27 =======
  7. 29 >>>>>>> 0b5b269 (Fix) =======
  8. 27 >>>>>>> 8ad6192 (Fix) =======
  9. 37 >>>>>>> 1ac6be1 (Fix) =======
  10. 29 >>>>>>> 1a9aba9 (Fix) =======
  11. 27 >>>>>>> 4f1a459 (Fix) =======
  12. 37 >>>>>>> 49e3b70 (Fix) =======
  13. 41 >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) =======
  14. 43 >>>>>>> aa4fb26 (Add sort orders) total_price = 0
  15. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  16. 27 =======
  17. 29 >>>>>>> 0b5b269 (Fix) =======
  18. 27 >>>>>>> 8ad6192 (Fix) =======
  19. 37 >>>>>>> 1ac6be1 (Fix) =======
  20. 29 >>>>>>> 1a9aba9 (Fix) =======
  21. 27 >>>>>>> 4f1a459 (Fix) =======
  22. 37 >>>>>>> 49e3b70 (Fix) =======
  23. 41 >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) =======
  24. 43 >>>>>>> aa4fb26 (Add sort orders) order_books.each do |order_book|
  25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  26. 25 =======
  27. 27 >>>>>>> 0b5b269 (Fix) =======
  28. 25 >>>>>>> 8ad6192 (Fix) =======
  29. 27 >>>>>>> 1ac6be1 (Fix) =======
  30. 27 >>>>>>> 1a9aba9 (Fix) =======
  31. 25 >>>>>>> 4f1a459 (Fix) =======
  32. 27 >>>>>>> 49e3b70 (Fix) =======
  33. 29 >>>>>>> aa4fb26 (Add sort orders) total_price += order_book.book.price_cents * order_book.quantity
  34. end
  35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  36. 27 =======
  37. 29 >>>>>>> 0b5b269 (Fix) =======
  38. 27 >>>>>>> 8ad6192 (Fix) =======
  39. 37 >>>>>>> 1ac6be1 (Fix) =======
  40. 29 >>>>>>> 1a9aba9 (Fix) =======
  41. 27 >>>>>>> 4f1a459 (Fix) =======
  42. 37 >>>>>>> 49e3b70 (Fix) =======
  43. 41 >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) =======
  44. 43 >>>>>>> aa4fb26 (Add sort orders) Money.new(total_price - (total_price * coupon) + delivery)
  45. end
  46. 1 def price
  47. Money.new(total_price)
  48. end
  49. 1 def date_time
  50. created_at.strftime('%m %d, %Y')
  51. end
  52. 1 def last_action_str
  53. updated_at.strftime('%F')
  54. end
  55. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= >>>>>>> 0b5b269 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 49e3b70 (Fix) >>>>>>> 7c4ea7f (Fix) ======= <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  3. ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased)
  4. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) =======
  6. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  7. >>>>>>> bd8bda4 (Manifest_cache true) =======
  8. >>>>>>> aa7b40c (Manifest_cache true) =======
  9. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) end
  10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
    >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 1577aeb (Rebased)
  1. 1 class ReviewDecorator < Draper::Decorator
  2. 1 delegate_all
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 1 def date_time
  5. 1 created_at.strftime('%m/%d/%Y')
  6. end
  7. end
  8. ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. ======= ======= >>>>>>> d780a52 (Rebased) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) =======
  9. 1 def date_time
  10. 1 created_at.strftime('%m/%d/%Y')
  11. end
  12. ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) end
  13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 836a973 (Rebased)
<<<<<<< HEAD

app/decorators/user_decorator.rb

=======

app/decorators/review_decorator.rb

>>>>>>> 836a973 (Rebased)

100.0% lines covered

<<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 4 relevant lines. 4 lines covered and >>>>>>> 836a973 (Rebased) 0 lines missed.
    
    <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased)
  1. 1 <<<<<<< HEAD class UserDecorator < Draper::Decorator ======= class ReviewDecorator < Draper::Decorator >>>>>>> 836a973 (Rebased)
  2. 1 delegate_all
  3. <<<<<<< HEAD <<<<<<< HEAD
  4. 1 def name_or_email
  5. 2 return name if name.present?
  6. 2 email.split('@').first.capitalize
  7. end
  8. end
  9. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1577aeb (Rebased) =======
  10. 1 def date_time
  11. 1 created_at.strftime('%m/%d/%Y')
  12. end
  13. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased)
<<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs)
>>>>>>> 93bdda9 (Featire specs)

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. >>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased)
======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased)
=======
>>>>>>> a5d032d (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix)
  2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  3. end

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class ReviewDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def date_time
  4. 1 created_at.strftime('%m/%d/%Y')
  5. end
  6. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end

app/helpers/application_helper.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 require 'image_processing'
  2. 1 module ApplicationHelper
  3. 1 def markdown(text)
  4. 17 Markdown.new(text).to_html.html_safe
  5. end
  6. end

app/helpers/constants.rb

100.0% lines covered

21 relevant lines. 21 lines covered and 0 lines missed.
    
  1. 1 module Constants
  2. 1 PAGINATION_PER_PAGE = 12
  3. 1 STAR_MIN = 0
  4. 1 STAR_MAX = 5
  5. 1 CATALOG_BOOK_COUNT = 3
  6. 1 BEST_SELLER_COUNT = 4
  7. 1 DESCRIPTION_LENGTH = 25
  8. 1 MIN_PRICE_IN_CENTS = 0
  9. 1 MAX_PRICE_IN_CENTS = 50_000
  10. 1 TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
  11. 1 NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
  12. 1 COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
  13. ======= >>>>>>> cde4834 (Manifest_cache true)
  14. 1 <<<<<<< HEAD PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
  15. 1 ZIP_FORMAT = /\A[0-9]+\z/.freeze
  16. 1 VALIDATES_NAME_LENGTH_MAX = 50
  17. 1 VALIDATES_TEXT_LENGTH_MAX = 500
  18. 1 VALIDATES_TITLE_LENGTH_MAX = 80
  19. 1 VALIDATES_PHONE_LENGTH_MAX = 15
  20. 1 VALIDATES_ZIP_LENGTH_MAX = 10
  21. 1 FOOTER_NUMBER = '(555)-555-5555'.freeze
  22. 1 FOOTER_EMAIL = 'support@bookstore.com'.freeze
  23. end

app/interactors/billing_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed.
    
  1. 1 class BillingUpdate
  2. 1 include Interactor
  3. 1 def call
  4. 1 params = context.permitted_params
  5. 1 user = context.current_user
  6. 1 return if params[:billing].nil?
  7. 1 return if user.billing.update(params[:billing])
  8. context.fail!
  9. end
  10. end

app/interactors/shipping_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed.
    
  1. 1 class ShippingUpdate
  2. 1 include Interactor
  3. 1 def call
  4. 1 params = context.permitted_params
  5. 1 user = context.current_user
  6. 1 return if params[:shipping].nil?
  7. 1 return if user.shipping.update(params[:shipping])
  8. context.fail!
  9. end
  10. end

app/interactors/user_update.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 class UserUpdate
  2. 1 include Interactor
  3. 1 def call
  4. 5 params = context.permitted_params
  5. 5 user = context.current_user
  6. 5 billing_and_shipping_update(params, user)
  7. 5 return if params[:user].nil?
  8. 3 return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
  9. 2 return if !params[:user][:password].nil? &&
  10. user.reset_password(params[:user][:password], params[:user][:password_confirmation])
  11. 1 context.fail!
  12. end
  13. 1 def billing_and_shipping_update(params, user)
  14. 5 return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
  15. 4 !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
  16. end
  17. end

app/jobs/application_job.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. 1 class ApplicationJob < ActiveJob::Base
  2. # Automatically retry jobs that encountered a deadlock
  3. # retry_on ActiveRecord::Deadlocked
  4. # Most jobs are safe to ignore if the underlying records are no longer available
  5. # discard_on ActiveJob::DeserializationError
  6. end

app/jobs/cart_cleaner.rb

60.0% lines covered

5 relevant lines. 3 lines covered and 2 lines missed.
    
  1. 1 class CartCleaner < ApplicationJob
  2. # include Sidekiq::Job
  3. 1 queue_as :default
  4. 1 def perform(order_id)
  5. order = Order.find(order_id)
  6. order.destroy if order.status.eql?('initialized')
  7. end
  8. end

app/models/address.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 class Address < ApplicationRecord
  2. 1 belongs_to :user
  3. 1 validates :first_name, :last_name,
  4. length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX },
  5. format: { with: Constants::NAME_FORMAT,
  6. message: 'Please enter first or last in correct format' }, allow_blank: true
  7. 1 validates :phone,
  8. length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
  9. format: { with: Constants::PHONE_FORMAT,
  10. message: 'Please enter phone in correct format' }, allow_blank: true
  11. 1 validates :address,
  12. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  13. format: { with: Constants::TEXT_FORMAT,
  14. message: 'Please enter address in correct format' }, allow_blank: true
  15. 1 validates :country, :city, ======= categories.map(&:name).join(', ') >>>>>>> cde4834 (Manifest_cache true)
  16. <<<<<<< HEAD length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX }, ======= end >>>>>>> cde4834 (Manifest_cache true)
  17. <<<<<<< HEAD format: { with: Constants::COUNTY_FORMAT,
  18. message: 'Please enter country in correct format' }, allow_blank: true
  19. 1 validates :zip,
  20. length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
  21. format: { with: Constants::ZIP_FORMAT,
  22. message: 'Please enter zip in correct format' }, allow_blank: true
  23. ======= >>>>>>> cde4834 (Manifest_cache true) end
<<<<<<< HEAD

app/models/admin_user.rb

=======

app/decorators/category_decorator.rb

>>>>>>> cde4834 (Manifest_cache true)

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD class PaginatingDecorator < Draper::CollectionDecorator ======= class AdminUser < ApplicationRecord >>>>>>> 836a973 (Rebased) ======= class AdminUser < ApplicationRecord ======= class CategoryDecorator < Draper::Decorator >>>>>>> 02a399d (Manifest_cache true) >>>>>>> ab67c96 (Manifest_cache true) ======= class AdminUser < ApplicationRecord >>>>>>> 1ac6be1 (Fix)
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD devise :database_authenticatable, <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= end >>>>>>> 02a399d (Manifest_cache true) >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) devise :database_authenticatable, >>>>>>> 1ac6be1 (Fix)
  5. :recoverable, :rememberable, :validatable <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= =======
  6. ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased)
======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased)
=======
>>>>>>> a5d032d (Fix)

app/decorators/paginating_decorator.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class PaginatingDecorator < Draper::CollectionDecorator ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  2. 1 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
  3. end

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class ReviewDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def date_time
  4. 1 created_at.strftime('%m/%d/%Y')
  5. end
  6. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end

app/helpers/application_helper.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 require 'image_processing'
  2. 1 module ApplicationHelper
  3. 1 def markdown(text)
  4. 17 Markdown.new(text).to_html.html_safe
  5. end
  6. end

app/helpers/constants.rb

100.0% lines covered

26 relevant lines. 26 lines covered and 0 lines missed.
    
  1. 1 module Constants
  2. 1 PAGINATION_PER_PAGE = 12
  3. 1 STAR_MIN = 0
  4. 1 STAR_MAX = 5
  5. 1 CATALOG_BOOK_COUNT = 3
  6. 1 BEST_SELLER_COUNT = 4
  7. 1 DESCRIPTION_LENGTH = 25
  8. 1 MIN_PRICE_IN_CENTS = 0
  9. 1 MAX_PRICE_IN_CENTS = 50_000
  10. 1 TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
  11. 1 NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
  12. 1 COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
  13. 1 PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
  14. 1 ZIP_FORMAT = /\A[0-9]+\z/.freeze
  15. 1 VALIDATES_NAME_LENGTH_MAX = 50
  16. 1 VALIDATES_TEXT_LENGTH_MAX = 500
  17. 1 VALIDATES_TITLE_LENGTH_MAX = 80
  18. 1 VALIDATES_PHONE_LENGTH_MAX = 15
  19. 1 VALIDATES_ZIP_LENGTH_MAX = 10
  20. 1 FOOTER_NUMBER = '(555)-555-5555'.freeze
  21. 1 FOOTER_EMAIL = 'support@bookstore.com'.freeze
  22. 1 CARD_NAME_MAX_LENGTH = 50
  23. 1 CARD_NAME_FORMAT = /\A[a-zA-Z ]*\z/.freeze
  24. 1 CARD_CVV_FORMAT = /\A[0-9]{3}\z/.freeze
  25. 1 CARD_DATE_FORMAT = %r{\A(0[1-9]|1[0-2])/?([0-9]{4}|[0-9]{2})\z}.freeze
  26. 1 CARD_CODE_FORMAT = /\A4[0-9]{15}(?:[0-9]{3})?\z/.freeze
  27. end

app/interactors/billing_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed.
    
  1. 1 class BillingUpdate
  2. 1 include Interactor
  3. 1 def call
  4. 1 params = context.permitted_params
  5. 1 user = context.current_user
  6. 1 return if params[:billing].nil?
  7. 1 return if user.billing.update(params[:billing])
  8. context.fail!
  9. end
  10. end

app/interactors/shipping_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed.
    
  1. 1 class ShippingUpdate
  2. 1 include Interactor
  3. 1 def call
  4. 1 params = context.permitted_params
  5. 1 user = context.current_user
  6. 1 return if params[:shipping].nil?
  7. 1 return if user.shipping.update(params[:shipping])
  8. context.fail!
  9. end
  10. end

app/interactors/user_update.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 class UserUpdate
  2. 1 include Interactor
  3. 1 def call
  4. 5 params = context.permitted_params
  5. 5 user = context.current_user
  6. 5 billing_and_shipping_update(params, user)
  7. 5 return if params[:user].nil?
  8. 3 return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
  9. 2 return if !params[:user][:password].nil? &&
  10. user.reset_password(params[:user][:password], params[:user][:password_confirmation])
  11. 1 context.fail!
  12. end
  13. 1 def billing_and_shipping_update(params, user)
  14. 5 BillingUpdate.call(permitted_params: params, current_user: user) unless params[:billing].nil?
  15. 5 ShippingUpdate.call(permitted_params: params, current_user: user) unless params[:shipping].nil?
  16. end
  17. end

app/jobs/cart_cleaner_job.rb

66.67% lines covered

6 relevant lines. 4 lines covered and 2 lines missed.
    
  1. 1 class CartCleanerJob
  2. 1 include Sidekiq::Worker
  3. 1 queue_as :default
  4. 1 def perform(order_id)
  5. order = Order.find(order_id)
  6. order.destroy if order.status.eql?('initialized')
  7. end
  8. end

app/models/address.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 class Address < ApplicationRecord
  2. 1 belongs_to :user
  3. 1 validates :first_name, :last_name,
  4. length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX },
  5. format: { with: Constants::NAME_FORMAT,
  6. message: 'Please enter first or last in correct format' }, allow_blank: true
  7. 1 validates :phone,
  8. length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
  9. format: { with: Constants::PHONE_FORMAT,
  10. message: 'Please enter phone in correct format' }, allow_blank: true
  11. 1 validates :address,
  12. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  13. format: { with: Constants::TEXT_FORMAT,
  14. message: 'Please enter address in correct format' }, allow_blank: true
  15. 1 validates :country, :city,
  16. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  17. format: { with: Constants::COUNTY_FORMAT,
  18. message: 'Please enter country in correct format' }, allow_blank: true
  19. 1 validates :zip,
  20. length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
  21. format: { with: Constants::ZIP_FORMAT,
  22. message: 'Please enter zip in correct format' }, allow_blank: true
  23. end

app/models/admin_user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD module ApplicationHelper ======= >>>>>>> 8f1bc14 (Fix)
  2. <<<<<<< HEAD
  3. 1 >>>>>>> 02a399d (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs)
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  5. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  6. ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs)
  7. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) =======
  8. >>>>>>> bd8bda4 (Manifest_cache true) =======
  9. >>>>>>> 4e81ea2 (Featire specs) =======
  10. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  11. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) =======
  12. >>>>>>> c033601 (Rebased) ======= =======
  13. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  14. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  15. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  16. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  17. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  18. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  19. >>>>>>> bf554f4 (Rebased) ======= =======
  20. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) =======
  21. >>>>>>> 7c4ea7f (Fix) =======
  22. >>>>>>> 866aee4 (Manifest_cache true) =======
  23. >>>>>>> 8f1bc14 (Fix) end

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class ReviewDecorator < Draper::Decorator ======= class CategoryDecorator < Draper::Decorator >>>>>>> cde4834 (Manifest_cache true) ======= class AdminUser < ApplicationRecord >>>>>>> 1577aeb (Rebased) ======= class AdminUser < ApplicationRecord ======= class CategoryDecorator < Draper::Decorator >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= class AdminUser < ApplicationRecord >>>>>>> 49e3b70 (Fix) ======= class AdminUser < ApplicationRecord ======= class CategoryDecorator < Draper::Decorator >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 6edce20 (Manifest_cache true) ======= class AdminUser < ApplicationRecord >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD delegate_all ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD devise :database_authenticatable, <<<<<<< HEAD >>>>>>> 1577aeb (Rebased)
  5. :recoverable, :rememberable, :validatable >>>>>>> c033601 (Rebased)
  6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  7. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  8. ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs)
  9. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) =======
  10. >>>>>>> bd8bda4 (Manifest_cache true) =======
  11. >>>>>>> 4e81ea2 (Featire specs) =======
  12. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  13. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) =======
  14. >>>>>>> c033601 (Rebased) ======= =======
  15. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  16. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  17. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  18. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  19. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  20. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  21. >>>>>>> bf554f4 (Rebased) ======= =======
  22. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) =======
  23. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  24. <<<<<<< HEAD
  25. 1 def date_time
  26. 1 created_at.strftime('%m/%d/%Y')
  27. end
  28. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end

app/helpers/application_helper.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 require 'image_processing'
  2. 1 module ApplicationHelper
  3. 1 def markdown(text)
  4. 17 Markdown.new(text).to_html.html_safe
  5. end
  6. end

app/helpers/constants.rb

100.0% lines covered

21 relevant lines. 21 lines covered and 0 lines missed.
    
  1. 1 module Constants
  2. 1 PAGINATION_PER_PAGE = 12
  3. 1 STAR_MIN = 0
  4. 1 STAR_MAX = 5
  5. 1 CATALOG_BOOK_COUNT = 3
  6. 1 BEST_SELLER_COUNT = 4
  7. 1 DESCRIPTION_LENGTH = 25
  8. 1 MIN_PRICE_IN_CENTS = 0
  9. 1 MAX_PRICE_IN_CENTS = 50_000
  10. 1 TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
  11. 1 NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
  12. 1 COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
  13. 1 PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
  14. 1 ZIP_FORMAT = /\A[0-9]+\z/.freeze
  15. 1 VALIDATES_NAME_LENGTH_MAX = 50
  16. 1 VALIDATES_TEXT_LENGTH_MAX = 500
  17. 1 VALIDATES_TITLE_LENGTH_MAX = 80
  18. 1 VALIDATES_PHONE_LENGTH_MAX = 15
  19. 1 VALIDATES_ZIP_LENGTH_MAX = 10
  20. 1 FOOTER_NUMBER = '(555)-555-5555'.freeze
  21. 1 FOOTER_EMAIL = 'support@bookstore.com'.freeze
  22. end

app/interactors/billing_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed.
    
  1. 1 class BillingUpdate
  2. 1 include Interactor
  3. 1 def call
  4. 1 params = context.permitted_params
  5. 1 user = context.current_user
  6. 1 return if params[:billing].nil?
  7. 1 return if user.billing.update(params[:billing])
  8. context.fail!
  9. end
  10. end

app/interactors/shipping_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed.
    
  1. 1 class ShippingUpdate
  2. 1 include Interactor
  3. 1 def call
  4. 1 params = context.permitted_params
  5. 1 user = context.current_user
  6. 1 return if params[:shipping].nil?
  7. 1 return if user.shipping.update(params[:shipping])
  8. context.fail!
  9. end
  10. end

app/interactors/user_update.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 class UserUpdate
  2. 1 include Interactor
  3. 1 def call
  4. 5 params = context.permitted_params
  5. 5 user = context.current_user
  6. 5 billing_and_shipping_update(params, user)
  7. 5 return if params[:user].nil?
  8. 3 return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
  9. 2 return if !params[:user][:password].nil? &&
  10. user.reset_password(params[:user][:password], params[:user][:password_confirmation])
  11. 1 context.fail!
  12. end
  13. 1 def billing_and_shipping_update(params, user)
  14. 5 return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
  15. 4 !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
  16. end
  17. end

app/jobs/application_job.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. 1 class ApplicationJob < ActiveJob::Base
  2. # Automatically retry jobs that encountered a deadlock
  3. # retry_on ActiveRecord::Deadlocked
  4. ======= >>>>>>> cde4834 (Manifest_cache true)
  5. <<<<<<< HEAD ======= end >>>>>>> cde4834 (Manifest_cache true)
  6. <<<<<<< HEAD # Most jobs are safe to ignore if the underlying records are no longer available
  7. # discard_on ActiveJob::DeserializationError
  8. end

app/jobs/cart_cleaner.rb

60.0% lines covered

5 relevant lines. 3 lines covered and 2 lines missed.
    
  1. 1 class CartCleaner < ApplicationJob
  2. # include Sidekiq::Job
  3. 1 queue_as :default
  4. 1 def perform(order_id)
  5. order = Order.find(order_id)
  6. order.destroy if order.status.eql?('initialized')
  7. end
  8. end

app/models/address.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 class Address < ApplicationRecord
  2. 1 belongs_to :user
  3. ======= >>>>>>> cde4834 (Manifest_cache true)
  4. <<<<<<< HEAD
  5. 1 validates :first_name, :last_name,
  6. length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX },
  7. format: { with: Constants::NAME_FORMAT,
  8. message: 'Please enter first or last in correct format' }, allow_blank: true
  9. 1 validates :phone,
  10. length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
  11. format: { with: Constants::PHONE_FORMAT,
  12. message: 'Please enter phone in correct format' }, allow_blank: true
  13. 1 validates :address,
  14. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  15. format: { with: Constants::TEXT_FORMAT,
  16. message: 'Please enter address in correct format' }, allow_blank: true
  17. 1 validates :country, :city,
  18. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  19. format: { with: Constants::COUNTY_FORMAT,
  20. message: 'Please enter country in correct format' }, allow_blank: true
  21. 1 validates :zip,
  22. length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
  23. format: { with: Constants::ZIP_FORMAT,
  24. message: 'Please enter zip in correct format' }, allow_blank: true
  25. end

app/models/admin_user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD class PaginatingDecorator < Draper::CollectionDecorator ======= class AdminUser < ApplicationRecord >>>>>>> ee78f39 (Rebased)
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 <<<<<<< HEAD <<<<<<< HEAD delegate :current_page, :per_page, :offset, :total_entries, :total_pages ======= ======= >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= devise :database_authenticatable, >>>>>>> ee78f39 (Rebased) ======= ======= end >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD devise :database_authenticatable, <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= end >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) devise :database_authenticatable, >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  5. :recoverable, :rememberable, :validatable <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= ======= =======

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper ======= >>>>>>> 8f1bc14 (Fix) ======= ======= =======

app/helpers/application_helper.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 module ApplicationHelper ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  2. <<<<<<< HEAD
  3. 1 >>>>>>> 02a399d (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs)
  4. <<<<<<< HEAD <<<<<<< HEAD
  5. 1 >>>>>>> 02a399d (Manifest_cache true) DESCRIPTION_LENGTH = 25 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs)
  6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  7. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  8. ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs)
  9. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) =======
  10. >>>>>>> bd8bda4 (Manifest_cache true) =======
  11. >>>>>>> 4e81ea2 (Featire specs) =======
  12. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  13. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) =======
  14. >>>>>>> c033601 (Rebased) ======= =======
  15. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  16. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  17. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  18. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  19. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  20. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  21. >>>>>>> bf554f4 (Rebased) ======= =======
  22. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) =======
  23. >>>>>>> 7c4ea7f (Fix) =======
  24. >>>>>>> 866aee4 (Manifest_cache true) =======
  25. >>>>>>> 8f1bc14 (Fix) =======
  26. >>>>>>> e991554 (Manifest_cache true) =======
  27. >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) end

app/decorators/review_decorator.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class ReviewDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def date_time
  4. 1 created_at.strftime('%m/%d/%Y')
  5. end
  6. end

app/decorators/user_decorator.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 class UserDecorator < Draper::Decorator
  2. 1 delegate_all
  3. 1 def name_or_email
  4. 2 return name if name.present?
  5. 2 email.split('@').first.capitalize
  6. end
  7. end
  8. ======= >>>>>>> cde4834 (Manifest_cache true)

app/helpers/application_helper.rb

100.0% lines covered

<<<<<<< HEAD 4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 require 'image_processing'
  2. 1 module ApplicationHelper
  3. 1 def markdown(text)
  4. 13 Markdown.new(text).to_html.html_safe
  5. end
  6. end

app/helpers/constants.rb

100.0% lines covered

21 relevant lines. 21 lines covered and 0 lines missed.
    
  1. 1 module Constants
  2. 1 PAGINATION_PER_PAGE = 12
  3. 1 STAR_MIN = 0
  4. 1 STAR_MAX = 5
  5. 1 CATALOG_BOOK_COUNT = 3
  6. 1 BEST_SELLER_COUNT = 4
  7. 1 DESCRIPTION_LENGTH = 25
  8. 1 MIN_PRICE_IN_CENTS = 0
  9. 1 MAX_PRICE_IN_CENTS = 50_000
  10. 1 TEXT_FORMAT = %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}.freeze
  11. 1 NAME_FORMAT = /\A[A-Za-z]+\z/.freeze
  12. 1 COUNTY_FORMAT = /\A[A-Za-z ]+\z/.freeze
  13. 1 PHONE_FORMAT = /\A[\\+]?[(]?[0-9]{3}[)]?[-\s\\.]?[0-9]{3}[-\s\\.]?[0-9]{4,6}\z/.freeze
  14. 1 ZIP_FORMAT = /\A[0-9]+\z/.freeze
  15. 1 VALIDATES_NAME_LENGTH_MAX = 50
  16. 1 VALIDATES_TEXT_LENGTH_MAX = 500
  17. 1 VALIDATES_TITLE_LENGTH_MAX = 80
  18. 1 VALIDATES_PHONE_LENGTH_MAX = 15
  19. 1 VALIDATES_ZIP_LENGTH_MAX = 10
  20. 1 FOOTER_NUMBER = '(555)-555-5555'.freeze
  21. 1 FOOTER_EMAIL = 'support@bookstore.com'.freeze
  22. end

app/interactors/billing_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed.
    
  1. 1 class BillingUpdate
  2. 1 include Interactor
  3. 1 def call
  4. 1 params = context.permitted_params
  5. 1 user = context.current_user
  6. 1 return if params[:billing].nil?
  7. 1 return if user.billing.update(params[:billing])
  8. context.fail!
  9. end
  10. end

app/interactors/shipping_update.rb

87.5% lines covered

8 relevant lines. 7 lines covered and 1 lines missed.
    
  1. 1 class ShippingUpdate
  2. 1 include Interactor
  3. 1 def call
  4. 1 params = context.permitted_params
  5. 1 user = context.current_user
  6. 1 return if params[:shipping].nil?
  7. 1 return if user.shipping.update(params[:shipping])
  8. context.fail!
  9. end
  10. end

app/interactors/user_update.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 class UserUpdate
  2. 1 include Interactor
  3. 1 def call
  4. 5 params = context.permitted_params
  5. 5 user = context.current_user
  6. 5 billing_and_shipping_update(params, user)
  7. 5 return if params[:user].nil?
  8. 3 return if !params[:user][:email].nil? && user.update(email: params[:user][:email])
  9. 2 return if !params[:user][:password].nil? &&
  10. user.reset_password(params[:user][:password], params[:user][:password_confirmation])
  11. 1 context.fail!
  12. end
  13. 1 def billing_and_shipping_update(params, user)
  14. 5 return if !params[:billing].nil? && BillingUpdate.call(permitted_params: params, current_user: user)
  15. 4 !params[:shipping].nil? && ShippingUpdate.call(permitted_params: params, current_user: user)
  16. end
  17. end

app/models/address.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 class Address < ApplicationRecord
  2. 1 belongs_to :user
  3. 1 validates :first_name, :last_name,
  4. length: { maximum: Constants::VALIDATES_NAME_LENGTH_MAX },
  5. format: { with: Constants::NAME_FORMAT,
  6. message: 'Please enter first or last in correct format' }, allow_blank: true
  7. 1 validates :phone,
  8. length: { maximum: Constants::VALIDATES_PHONE_LENGTH_MAX },
  9. format: { with: Constants::PHONE_FORMAT,
  10. message: 'Please enter phone in correct format' }, allow_blank: true
  11. 1 validates :address,
  12. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  13. format: { with: Constants::TEXT_FORMAT,
  14. message: 'Please enter address in correct format' }, allow_blank: true
  15. 1 validates :country, :city,
  16. length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  17. format: { with: Constants::COUNTY_FORMAT,
  18. message: 'Please enter country in correct format' }, allow_blank: true
  19. 1 validates :zip,
  20. length: { maximum: Constants::VALIDATES_ZIP_LENGTH_MAX },
  21. format: { with: Constants::ZIP_FORMAT,
  22. message: 'Please enter zip in correct format' }, allow_blank: true
  23. end

app/models/admin_user.rb

100.0% lines covered

======= >>>>>>> cde4834 (Manifest_cache true) 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD class AdminUser < ApplicationRecord ======= module ApplicationHelper >>>>>>> cde4834 (Manifest_cache true)
  2. <<<<<<< HEAD
  3. <<<<<<< HEAD ======= # Include default devise modules. Others available are:
  4. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  5. 1 >>>>>>> d780a52 (Rebased) =======
  6. 1 >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # Include default devise modules. Others available are: ======= ======= >>>>>>> d780a52 (Rebased) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) DESCRIPTION_LENGTH = 25 <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= devise :database_authenticatable, >>>>>>> d780a52 (Rebased) ======= DESCRIPTION_LENGTH = 25 >>>>>>> cde4834 (Manifest_cache true)
  7. <<<<<<< HEAD
  8. :recoverable, :rememberable, :validatable >>>>>>> c033601 (Rebased)
  9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  10. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  11. ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs)
  12. <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) =======
  13. >>>>>>> bd8bda4 (Manifest_cache true) =======
  14. >>>>>>> 4e81ea2 (Featire specs) =======
  15. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  16. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) =======
  17. >>>>>>> c033601 (Rebased) ======= =======
  18. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  19. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  20. >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  21. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  22. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  23. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  24. >>>>>>> bf554f4 (Rebased) =======
  25. >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  26. 1 devise :database_authenticatable,
  27. :recoverable, :rememberable, :validatable
  28. ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) end

app/models/application_record.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class ApplicationRecord < ActiveRecord::Base
  2. 1 self.abstract_class = true
  3. end

app/models/author.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) 4 relevant lines. 4 lines covered and ======= 5 relevant lines. 5 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> bebaea7 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 5 relevant lines. 5 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 4 relevant lines. 4 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed.
    
  1. 1 class Author < ApplicationRecord
  2. 1 has_many :authors_books, dependent: :destroy
  3. 1 has_many :books, through: :authors_books
  4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :first_name, :last_name, presence: true ======= validates :first_name, presence: true >>>>>>> cde4834 (Manifest_cache true) ======= validates :first_name, :last_name, presence: true >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) validates :first_name, :last_name, presence: true ======= validates :first_name, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs)
  6. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
  7. 1 validates :last_name, presence: true
  8. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) =======
  9. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) end

app/models/authors_book.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class AuthorsBook < ApplicationRecord
  2. 1 belongs_to :author
  3. 1 belongs_to :book
  4. 1 validates :author, :book, presence: true ======= validates :first_name, :last_name, presence: true >>>>>>> bebaea7 (Rebased) ======= validates :first_name, :last_name, presence: true ======= validates :first_name, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= validates :first_name, :last_name, presence: true >>>>>>> 1a9aba9 (Fix) ======= validates :first_name, :last_name, presence: true ======= validates :first_name, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= validates :first_name, :last_name, presence: true >>>>>>> 49e3b70 (Fix) ======= validates :first_name, :last_name, presence: true ======= validates :first_name, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= validates :first_name, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= validates :first_name, :last_name, presence: true >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  5. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) =======

app/models/authors_book.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class AuthorsBook < ApplicationRecord
  2. 1 belongs_to :author
  3. 1 belongs_to :book
  4. 1 validates :author, :book, presence: true
  5. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

app/models/billing.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. 1 class Billing < Address
  2. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

app/models/book.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 10 relevant lines. 10 lines covered and ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) 8 relevant lines. 8 lines covered and >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) 8 relevant lines. 8 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> 8c32a77 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 113da87 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 8b420cf (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 20256f8 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 078304c (Rebased) ======= 10 relevant lines. 10 lines covered and >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) 10 relevant lines. 10 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= 10 relevant lines. 10 lines covered and >>>>>>> 1ac6be1 (Fix) ======= 9 relevant lines. 9 lines covered and >>>>>>> cde4834 (Manifest_cache true) ======= 8 relevant lines. 8 lines covered and >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bebaea7 (Rebased) ======= 10 relevant lines. 10 lines covered and >>>>>>> 1a9aba9 (Fix) ======= 10 relevant lines. 10 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= 10 relevant lines. 10 lines covered and >>>>>>> 49e3b70 (Fix) ======= 10 relevant lines. 10 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed.
    
  1. 1 class Book < ApplicationRecord
  2. 1 has_many :authors_books, dependent: :destroy
  3. 1 has_many :authors, through: :authors_books
  4. 1 has_many :books_categories, dependent: :destroy
  5. 1 has_many :categories, through: :books_categories
  6. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD has_many_attached :images ======= has_many :reviews, dependent: :destroy >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) has_many :reviews, dependent: :destroy ======= validates :title, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> 078304c (Rebased) ======= has_many :reviews, dependent: :destroy ======= validates :title, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= has_many_attached :images >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) has_many_attached :images ======= validates :title, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 27e3351 (Featire specs) ======= has_many_attached :images >>>>>>> 1ac6be1 (Fix) ======= validates :title, presence: true >>>>>>> cde4834 (Manifest_cache true) ======= has_many :reviews, dependent: :destroy >>>>>>> 1577aeb (Rebased) ======= has_many :reviews, dependent: :destroy ======= validates :title, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> bebaea7 (Rebased) ======= has_many :reviews, dependent: :destroy ======= validates :title, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= has_many_attached :images >>>>>>> 1a9aba9 (Fix) ======= has_many_attached :images ======= validates :title, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= has_many_attached :images >>>>>>> 49e3b70 (Fix) ======= has_many_attached :images ======= validates :title, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= validates :title, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs)
  8. =======
  9. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) =======
  10. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) =======
  11. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) =======
  12. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) =======
  13. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) =======
  14. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) =======
  15. >>>>>>> bebaea7 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======
  16. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) =======
  17. >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) =======
  18. >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======
  19. >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :description, presence: true >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= validates :description, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= ======= validates :description, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= validates :description, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= validates :description, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= validates :description, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  20. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD has_many_attached :images ======= validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= has_many_attached :images >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) has_many :reviews, dependent: :destroy >>>>>>> 1d59aaa (Fix) ======= validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 836a973 (Rebased) ======= validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= has_many_attached :images >>>>>>> 078304c (Rebased) ======= has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) has_many :reviews, dependent: :destroy ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4552227 (Featire specs) >>>>>>> 27e3351 (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> 1ac6be1 (Fix) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> cde4834 (Manifest_cache true) ======= validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 1577aeb (Rebased) ======= validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= has_many_attached :images >>>>>>> bebaea7 (Rebased) ======= has_many :reviews, dependent: :destroy ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= has_many :reviews, dependent: :destroy ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs)
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs)
  22. <<<<<<< HEAD <<<<<<< HEAD
  23. =======
  24. >>>>>>> cde4834 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true ======= validates :price_cents, :quantity, presence: true, >>>>>>> ee78f39 (Rebased) ======= validates :price_cents, :quantity, presence: true, >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) validates :price_cents, :quantity, presence: true, ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> cde4834 (Manifest_cache true) ======= validates :price_cents, :quantity, presence: true, >>>>>>> 1577aeb (Rebased) ======= validates :price_cents, :quantity, presence: true, ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs)
  25. <<<<<<< HEAD
  26. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) validates :price_cents, :quantity, presence: true, ======= validates :price, :quantity, presence: true, >>>>>>> d0dc1f1 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 752f0c0 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) ======= validates :price, :quantity, presence: true, >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5be567f (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= validates :price, :quantity, presence: true, >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs)
  27. =======
  28. >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) numericality: ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs)
  29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
  30. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
  31. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
  32. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
  33. ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD end

app/models/books_category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class BooksCategory < ApplicationRecord
  2. 1 belongs_to :category
  3. 1 belongs_to :book
  4. ======= >>>>>>> 49e8a6c (Rebased)
  5. 1 has_many_attached :images ======= numericality: >>>>>>> 836a973 (Rebased) ======= numericality: { greater_than_or_equal_to: 0.0, less_than_or_equal_to: 100 } >>>>>>> cde4834 (Manifest_cache true) ======= numericality: >>>>>>> 1577aeb (Rebased)
  6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  7. 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
  8. 1 validates :price_cents, :quantity, presence: true,
  9. numericality:
  10. ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
  11. <<<<<<< HEAD <<<<<<< HEAD
  12. =======
  13. >>>>>>> 836a973 (Rebased) =======
  14. >>>>>>> 1577aeb (Rebased) less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
  15. <<<<<<< HEAD <<<<<<< HEAD
  16. =======
  17. >>>>>>> 836a973 (Rebased) =======
  18. >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) end

app/models/books_category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class BooksCategory < ApplicationRecord
  2. 1 belongs_to :category
  3. 1 belongs_to :book
  4. ======= >>>>>>> 078304c (Rebased)
  5. 1 ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) has_many_attached :images ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> d0dc1f1 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 752f0c0 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4e81ea2 (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= has_many :reviews, dependent: :destroy >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> ea0650c (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= has_many :reviews, dependent: :destroy >>>>>>> 49e3b70 (Fix) ======= >>>>>>> bc0ff2c (Featire specs) ======= ======= validates :year_of_publication, :materials, :dimensions, presence: true >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= has_many_attached :images >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  7. 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
  8. 1 validates :price_cents, :quantity, presence: true,
  9. numericality:
  10. { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
  11. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
  12. ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) end

app/models/books_category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class BooksCategory < ApplicationRecord
  2. 1 belongs_to :category
  3. 1 belongs_to :book
  4. ======= ======= <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  5. >>>>>>> bebaea7 (Rebased)
  6. 1 validates :title, :description, :year_of_publication, :materials, :dimensions, presence: true
  7. 1 validates :price_cents, :quantity, presence: true,
  8. numericality:
  9. { greater_than_or_equal_to: Constants::MIN_PRICE_IN_CENTS,
  10. less_than_or_equal_to: Constants::MAX_PRICE_IN_CENTS }
  11. end

app/models/books_category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class BooksCategory < ApplicationRecord
  2. 1 belongs_to :category
  3. 1 belongs_to :book
  4. 1 validates :category, :book, presence: true
  5. end

app/models/category.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class Category < ApplicationRecord
  2. 1 has_many :books_categories, dependent: :destroy
  3. 1 has_many :books, through: :books_categories
  4. 1 validates :name, presence: true
  5. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> e031bce (Manifest_cache true) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 02ba384 (Manifest_cache true) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
>>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
=======
=======
======= >>>>>>> df37394 (Featire specs) ======= =======
======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
=======
=======
======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
=======
=======
=======
======= >>>>>>> 715fac2 (Featire specs) ======= =======
======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
=======
=======
======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
=======
=======
=======
======= >>>>>>> 3dc272d (Featire specs) ======= =======
======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
>>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
=======
=======
======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
=======
=======
=======

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 26b462d (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) ======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)

app/models/coupon.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class Coupon < ApplicationRecord
  2. 1 belongs_to :order, optional: true
  3. end

app/models/credit_card.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed.
    
  1. 1 class CreditCard < ApplicationRecord
  2. 1 belongs_to :user
  3. 1 validates :name, length: { maximum: Constants::CARD_NAME_MAX_LENGTH }, format: { with: Constants::CARD_NAME_FORMAT },
  4. allow_blank: true
  5. 1 validates :expiration_date, format: { with: Constants::CARD_DATE_FORMAT },
  6. allow_blank: true
  7. 1 validates :cvv, format: { with: Constants::CARD_CVV_FORMAT },
  8. allow_blank: true
  9. 1 validates :code, format: { with: Constants::CARD_CODE_FORMAT },
  10. allow_blank: true
  11. end

app/models/delivery.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed.
    
  1. 1 class Delivery < ApplicationRecord
  2. 1 has_many :orders, dependent: :nullify
  3. 1 validates :delivery_method, presence: true
  4. end

app/models/order.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed.
    
  1. 1 class Order < ApplicationRecord
  2. 1 has_many :order_books, dependent: :destroy
  3. 1 has_many :books, through: :order_books
  4. 1 has_one :coupon, dependent: :nullify
  5. 1 has_one :address, dependent: :nullify
  6. 1 belongs_to :delivery, optional: true
  7. end

app/models/order_book.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed.
    
  1. 1 class OrderBook < ApplicationRecord
  2. 1 belongs_to :order
  3. 1 belongs_to :book
  4. end
>>>>>>> 7c4ea7f (Fix)

app/models/user.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 4552227 (Featire specs) ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
>>>>>>> a5d032d (Fix)

app/models/review.rb

100.0% <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======

app/models/user.rb

100.0% ======= >>>>>>> a5d032d (Fix) lines covered

<<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) 7 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 7 relevant lines. >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= 7 relevant lines. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= 7 relevant lines. >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= 7 relevant lines. >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) 7 lines covered and 0 lines missed.
    
  1. 1 class Review < ApplicationRecord
  2. 1 belongs_to :user
  3. 1 belongs_to :book
  4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
  6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
  7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
  8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
  9. 1 validates :rating,
  10. numericality: {
  11. greater_than_or_equal_to: Constants::STAR_MIN,
  12. less_than_or_equal_to: Constants::STAR_MAX
  13. }, presence: true
  14. end

app/models/shipping.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. 1 class Shipping < Address
  2. end
<<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix)

app/models/user.rb

57.14% lines covered

14 relevant lines. 8 lines covered and 6 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. 1 devise :database_authenticatable, :registerable,
  3. :recoverable, :rememberable, :validatable,
  4. :confirmable, :lockable, :timeoutable, :trackable,
  5. :omniauthable, omniauth_providers: [:facebook]
  6. 1 has_one :billing, dependent: :destroy
  7. 1 has_one :shipping, dependent: :destroy
  8. 1 has_one :credit_card, dependent: :destroy
  9. 1 has_many :orders, dependent: :destroy
  10. 1 has_many :reviews, dependent: :destroy
  11. 1 def self.from_omniauth(auth)
  12. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
  13. user.provider = auth.provider
  14. user.uid = auth.uid
  15. user.name = auth.info.name
  16. user.email = auth.info.email
  17. user.password = Devise.friendly_token[0, 20]
  18. end
  19. end
  20. end
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages)

app/models/user.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
>>>>>>> 26b462d (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 87.5% >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix)

app/models/coupon.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class Coupon < ApplicationRecord
  2. 1 belongs_to :order, optional: true
  3. end

app/models/order.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class Order < ApplicationRecord
  2. 1 has_many :order_books, dependent: :destroy
  3. 1 has_many :books, through: :order_books
  4. 1 has_one :coupon, dependent: :nullify
  5. end

app/models/order_book.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed.
    
  1. 1 class OrderBook < ApplicationRecord
  2. 1 belongs_to :order
  3. 1 belongs_to :book
  4. end
>>>>>>> 7c4ea7f (Fix)

app/models/user.rb

100.0% ======= 85.71% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 4552227 (Featire specs) ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
>>>>>>> a5d032d (Fix)

app/models/review.rb

100.0% <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======

app/models/user.rb

100.0% ======= >>>>>>> a5d032d (Fix) lines covered

<<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) 7 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 7 relevant lines. >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= 7 relevant lines. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= 7 relevant lines. >>>>>>> 8f1bc14 (Fix) 7 lines covered and 0 lines missed.
    
  1. 1 class Review < ApplicationRecord
  2. 1 belongs_to :user
  3. 1 belongs_to :book
  4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
  6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
  7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
  8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
  9. 1 validates :rating,
  10. numericality: {
  11. greater_than_or_equal_to: Constants::STAR_MIN,
  12. less_than_or_equal_to: Constants::STAR_MAX
  13. }, presence: true
  14. end

app/models/shipping.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. 1 class Shipping < Address
  2. end
<<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix)

app/models/user.rb

53.85% lines covered

13 relevant lines. 7 lines covered and 6 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. 1 devise :database_authenticatable, :registerable,
  3. :recoverable, :rememberable, :validatable,
  4. :confirmable, :lockable, :timeoutable, :trackable,
  5. :omniauthable, omniauth_providers: [:facebook]
  6. 1 has_one :billing, dependent: :destroy
  7. 1 has_one :shipping, dependent: :destroy
  8. 1 has_one :order, dependent: :destroy
  9. 1 has_many :reviews, dependent: :destroy
  10. 1 def self.from_omniauth(auth)
  11. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
  12. user.provider = auth.provider
  13. user.uid = auth.uid
  14. user.name = auth.info.name
  15. user.email = auth.info.email
  16. user.password = Devise.friendly_token[0, 20]
  17. end
  18. end
  19. end
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages)

app/models/user.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
>>>>>>> 26b462d (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD

app/models/coupon.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class Coupon < ApplicationRecord
  2. 1 belongs_to :order, optional: true
  3. end

app/models/order.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 class Order < ApplicationRecord
  2. 1 has_many :order_books, dependent: :destroy
  3. 1 has_many :books, through: :order_books
  4. 1 has_one :coupon, dependent: :nullify
  5. end

app/models/order_book.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed.
    
  1. 1 class OrderBook < ApplicationRecord
  2. 1 belongs_to :order
  3. 1 belongs_to :book
  4. end
>>>>>>> 7c4ea7f (Fix)

app/models/user.rb

100.0% ======= <<<<<<< HEAD ======= 87.5% ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 87.5% ======= 85.71% >>>>>>> 752f0c0 (Featire specs) ======= 85.71% >>>>>>> 4e81ea2 (Featire specs) ======= 85.71% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) lines covered

<<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 4552227 (Featire specs) ======= 87.5% >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
>>>>>>> a5d032d (Fix)

app/models/review.rb

100.0% <<<<<<< HEAD ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) =======

app/models/user.rb

100.0% ======= >>>>>>> a5d032d (Fix) lines covered

<<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD 7 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 7 relevant lines. >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= 7 relevant lines. >>>>>>> 7c4ea7f (Fix) 7 lines covered and 0 lines missed.
    
  1. 1 class Review < ApplicationRecord
  2. 1 belongs_to :user
  3. 1 belongs_to :book
  4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
  6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
  7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
  8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
  9. 1 validates :rating,
  10. numericality: {
  11. greater_than_or_equal_to: Constants::STAR_MIN,
  12. less_than_or_equal_to: Constants::STAR_MAX
  13. }, presence: true
  14. end

app/models/shipping.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. 1 class Shipping < Address
  2. end
<<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix)

app/models/user.rb

53.85% lines covered

13 relevant lines. 7 lines covered and 6 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. 1 devise :database_authenticatable, :registerable,
  3. :recoverable, :rememberable, :validatable,
  4. :confirmable, :lockable, :timeoutable, :trackable,
  5. :omniauthable, omniauth_providers: [:facebook]
  6. 1 has_one :billing, dependent: :destroy
  7. 1 has_one :shipping, dependent: :destroy
  8. 1 has_one :order, dependent: :destroy
  9. 1 has_many :reviews, dependent: :destroy
  10. 1 def self.from_omniauth(auth)
  11. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
  12. user.provider = auth.provider
  13. user.uid = auth.uid
  14. user.name = auth.info.name
  15. user.email = auth.info.email
  16. user.password = Devise.friendly_token[0, 20]
  17. end
  18. end
  19. end
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e50f73e (Add login registration pages)

app/models/user.rb

100.0% lines covered

<<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
>>>>>>> e1f4d17 (Add login registration pages)

app/models/user.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) =======
>>>>>>> a5d032d (Fix)

app/models/review.rb

100.0% <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 87.5% >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD

app/models/user.rb

100.0% ======= >>>>>>> a5d032d (Fix) ======= 85.71% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 85.71% <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 85.71% >>>>>>> 7a02bbe (Featire specs) ======= 87.5% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 7 relevant lines. >>>>>>> a5d032d (Fix) 7 lines covered and 0 lines missed.
    
  1. 1 class Review < ApplicationRecord
  2. 1 belongs_to :user
  3. 1 belongs_to :book
  4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
  6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
  7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
  8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
  9. 1 validates :rating,
  10. numericality: {
  11. greater_than_or_equal_to: Constants::STAR_MIN,
  12. less_than_or_equal_to: Constants::STAR_MAX
  13. }, presence: true
  14. end

app/models/shipping.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. 1 class Shipping < Address
  2. end
<<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix)

app/models/user.rb

50.0% lines covered

12 relevant lines. 6 lines covered and 6 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. 1 devise :database_authenticatable, :registerable,
  3. :recoverable, :rememberable, :validatable,
  4. :confirmable, :lockable, :timeoutable, :trackable,
  5. :omniauthable, omniauth_providers: [:facebook]
  6. 1 has_one :billing, dependent: :destroy
  7. 1 has_one :shipping, dependent: :destroy
  8. 1 has_many :reviews, dependent: :destroy
  9. 1 def self.from_omniauth(auth)
  10. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
  11. user.provider = auth.provider
  12. user.uid = auth.uid
  13. user.name = auth.info.name
  14. user.email = auth.info.email
  15. user.password = Devise.friendly_token[0, 20]
  16. end
  17. end
  18. end
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD >>>>>>> 730a8ca (Add login registration pages)

app/models/user.rb

<<<<<<< HEAD =======

app/models/review.rb

>>>>>>> aca90e3 (Rebased) ======= >>>>>>> d96cf3b (Featire specs)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD 2 relevant lines. 2 lines covered and ======= 7 relevant lines. 7 lines covered and >>>>>>> aca90e3 (Rebased) 0 lines missed.
    
  1. 1 <<<<<<< HEAD ======= class Review < ApplicationRecord
  2. 1 belongs_to :user
  3. 1 belongs_to :book
  4. 1 validates :title, presence: true, length: { maximum: Constants::VALIDATES_TITLE_LENGTH_MAX },
  5. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.title') }
  6. 1 validates :body, presence: true, length: { maximum: Constants::VALIDATES_TEXT_LENGTH_MAX },
  7. format: { with: %r{\A[A-Za-z0-9!#$%&'*+-/=?^_`{|}~. ]+\z}, message: I18n.t('review.errors.body') }
  8. 1 validates :verified, inclusion: { in: [true, false] }, presence: true
  9. 1 validates :rating,
  10. numericality: {
  11. greater_than_or_equal_to: Constants::STAR_MIN,
  12. less_than_or_equal_to: Constants::STAR_MAX
  13. }, presence: true
  14. end

app/models/shipping.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. 1 class Shipping < Address
  2. end

app/models/user.rb

50.0% lines covered

12 relevant lines. 6 lines covered and 6 lines missed.
    
  1. 1 >>>>>>> aca90e3 (Rebased) class User < ApplicationRecord
  2. <<<<<<< HEAD
  3. # Include default devise modules. Others available are:
  4. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  5. =======
  6. >>>>>>> aca90e3 (Rebased) 1 devise :database_authenticatable, :registerable,
  7. <<<<<<< HEAD
  8. =======
  9. >>>>>>> aca90e3 (Rebased) :recoverable, :rememberable, :validatable,
  10. <<<<<<< HEAD
  11. =======
  12. >>>>>>> aca90e3 (Rebased) :confirmable, :lockable, :timeoutable, :trackable,
  13. <<<<<<< HEAD
  14. =======
  15. >>>>>>> aca90e3 (Rebased) <<<<<<< HEAD :omniauthable ======= :omniauthable, omniauth_providers: [:facebook] >>>>>>> aca90e3 (Rebased)
  16. <<<<<<< HEAD
  17. =======
  18. 1 has_one :billing, dependent: :destroy
  19. 1 has_one :shipping, dependent: :destroy
  20. 1 has_many :reviews, dependent: :destroy
  21. 1 def self.from_omniauth(auth)
  22. where(provider: auth.provider, uid: auth.uid).first_or_create do |user|
  23. user.provider = auth.provider
  24. user.uid = auth.uid
  25. user.name = auth.info.name
  26. user.email = auth.info.email
  27. user.password = Devise.friendly_token[0, 20]
  28. end
  29. end
  30. >>>>>>> aca90e3 (Rebased) end
<<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> aca90e3 (Rebased)

app/queries/book_query.rb

90.0% lines covered

10 relevant lines. 9 lines covered and ======= 2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 class User < ApplicationRecord
  2. # Include default devise modules. Others available are:
  3. # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
  4. 1 devise :database_authenticatable, :registerable,
  5. :recoverable, :rememberable, :validatable,
  6. :confirmable, :lockable, :timeoutable, :trackable,
  7. :omniauthable
  8. end
>>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
>>>>>>> a5d032d (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 836a973 (Rebased) ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix)

app/queries/book_query.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> eaef86a (Fix) 87.5% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) 87.5% ======= 85.71% >>>>>>> 752f0c0 (Featire specs) ======= 85.71% >>>>>>> 4e81ea2 (Featire specs) ======= 85.71% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= 87.5% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 90.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 90.0% >>>>>>> a5d032d (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= ======= 90.0% >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> eaef86a (Fix) 8 relevant lines. 7 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) 8 relevant lines. 7 lines covered and ======= 7 relevant lines. 6 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 904663c (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 872e675 (Fix) ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 8b420cf (Featire specs) ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= 7 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= 8 relevant lines. 7 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 78d0719 (Featire specs) ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 7 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= 7 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD 8 relevant lines. 7 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= 6 lines covered and >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= 10 relevant lines. 9 lines covered and >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= 6 lines covered and >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= 10 relevant lines. 9 lines covered and >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 1 lines missed.
    
  1. 1 class BookQuery
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price DESC', 'most_popular', 'price', 'title', 'title DESC'].freeze >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= SORT_METHODS = ['created_at', 'created_at DESC', 'price_cents DESC', 'most_popular', 'price_cents', 'title', >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price) 'title DESC'].freeze ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) 'title DESC'].freeze >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 'title DESC'].freeze >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= 'title DESC'].freeze >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= 'title DESC'].freeze >>>>>>> 836a973 (Rebased) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= 'title DESC'].freeze >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= 'title DESC'].freeze >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= 'title DESC'].freeze >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= 'title DESC'].freeze >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= 'title DESC'].freeze >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= 'title DESC'].freeze >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= 'title DESC'].freeze >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= ======= ======= ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= ======= ======= ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) def self.query(params)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  6. =======
  7. >>>>>>> 752f0c0 (Featire specs) =======
  8. >>>>>>> 4e81ea2 (Featire specs) 24 =======
  9. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  10. 24 >>>>>>> 08edf50 (Featire specs) =======
  11. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  12. 30 >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages)
  13. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages)
  14. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
  15. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages)
  16. 30 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  17. 24 ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  18. 24 >>>>>>> df37394 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  19. 24 >>>>>>> 715fac2 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages)
  20. 24 >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD ======= =======
  21. 25 >>>>>>> 1214e1f (Add login registration pages) =======
  22. 24 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) =======
  23. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 69eb97e (Add login registration pages) =======
  24. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= =======
  25. 30 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs)
  26. 30 =======
  27. 30 >>>>>>> 9620751 (Featire specs) =======
  28. 30 >>>>>>> 9dc109d (Featire specs) =======
  29. 30 >>>>>>> 65f3409 (Featire specs) =======
  30. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  31. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  32. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) =======
  33. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= =======
  34. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  35. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======
  36. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 089f8cf (Add login registration pages) =======
  37. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) =======
  38. 30 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) =======
  39. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) =======
  40. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= =======
  41. 30 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs)
  42. 30 =======
  43. 30 >>>>>>> 9620751 (Featire specs) =======
  44. 30 >>>>>>> 9dc109d (Featire specs) =======
  45. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  46. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  47. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) =======
  48. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= =======
  49. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  50. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  51. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) =======
  52. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  53. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) =======
  54. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) =======
  55. 25 >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 0b5b269 (Fix) =======
  56. 30 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  57. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) =======
  58. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= =======
  59. 30 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs)
  60. 30 =======
  61. 30 >>>>>>> 9620751 (Featire specs) =======
  62. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  63. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  64. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  65. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= =======
  66. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  67. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  68. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  69. 25 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> eaef86a (Fix) =======
  70. 30 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  71. 24 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d7fadcd (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  72. 24 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 5caffae (Add login registration pages) ======= <<<<<<< HEAD
  73. 25 >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= =======
  74. 30 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  75. 24 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) =======
  76. 25 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= =======
  77. 30 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs)
  78. 30 =======
  79. 24 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= =======
  80. 24 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  81. 24 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= =======
  82. 25 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= =======
  83. 24 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= =======
  84. 24 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= =======
  85. 24 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= =======
  86. 25 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= =======
  87. 30 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5caffae (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) =======
  88. 30 >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= =======
  89. 30 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price) if SORT_METHODS.include?(params[:sort].to_s) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) >>>>>>> 2fd2048 (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 13fd74f (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 20256f8 (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> b35d1f8 (Featire specs) if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= if ApplicationHelper::SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= if SORT_METHODS.include?(params[:sort].to_s) >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  90. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  91. 12 ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  92. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  93. =======
  94. >>>>>>> 752f0c0 (Featire specs) =======
  95. >>>>>>> 4e81ea2 (Featire specs) =======
  96. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  97. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
  98. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  99. 12 =======
  100. 12 >>>>>>> 9620751 (Featire specs) =======
  101. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  102. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  103. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  104. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= ======= >>>>>>> df37394 (Featire specs)
  105. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  106. =======
  107. >>>>>>> 752f0c0 (Featire specs) =======
  108. >>>>>>> 4e81ea2 (Featire specs) =======
  109. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  110. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= =======
  111. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= ======= >>>>>>> 715fac2 (Featire specs)
  112. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  113. =======
  114. >>>>>>> 752f0c0 (Featire specs) =======
  115. >>>>>>> 4e81ea2 (Featire specs) =======
  116. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  117. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  118. 12 >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3dc272d (Featire specs)
  119. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  120. =======
  121. >>>>>>> 752f0c0 (Featire specs) =======
  122. >>>>>>> 4e81ea2 (Featire specs) =======
  123. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  124. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  125. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  126. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  127. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  128. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  129. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  130. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price)
  131. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  132. 12 =======
  133. 12 >>>>>>> 9620751 (Featire specs) =======
  134. 12 >>>>>>> 9dc109d (Featire specs) =======
  135. 12 >>>>>>> 65f3409 (Featire specs) =======
  136. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  137. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  138. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  139. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) =======
  140. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  141. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======
  142. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  143. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  144. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  145. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  146. 12 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= =======
  147. 12 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
  148. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  149. 12 =======
  150. 12 >>>>>>> 9620751 (Featire specs) =======
  151. 12 >>>>>>> 9dc109d (Featire specs) =======
  152. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  153. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  154. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) =======
  155. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) =======
  156. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  157. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  158. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  159. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  160. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) =======
  161. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  162. 12 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= =======
  163. 12 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= =======
  164. 12 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) if params[:category].nil?
  165. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  166. 12 ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  167. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  168. =======
  169. >>>>>>> 752f0c0 (Featire specs) =======
  170. >>>>>>> 4e81ea2 (Featire specs) =======
  171. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  172. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price)
  173. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  174. 12 =======
  175. 12 >>>>>>> 9620751 (Featire specs) =======
  176. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  177. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  178. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  179. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= ======= >>>>>>> df37394 (Featire specs)
  180. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  181. =======
  182. >>>>>>> 752f0c0 (Featire specs) =======
  183. >>>>>>> 4e81ea2 (Featire specs) =======
  184. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  185. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= =======
  186. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= ======= >>>>>>> 715fac2 (Featire specs)
  187. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  188. =======
  189. >>>>>>> 752f0c0 (Featire specs) =======
  190. >>>>>>> 4e81ea2 (Featire specs) =======
  191. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  192. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  193. 12 >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3dc272d (Featire specs)
  194. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  195. =======
  196. >>>>>>> 752f0c0 (Featire specs) =======
  197. >>>>>>> 4e81ea2 (Featire specs) =======
  198. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  199. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  200. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  201. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  202. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  203. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  204. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  205. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price)
  206. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  207. 12 =======
  208. 12 >>>>>>> 9620751 (Featire specs) =======
  209. 12 >>>>>>> 9dc109d (Featire specs) =======
  210. 12 >>>>>>> 65f3409 (Featire specs) =======
  211. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  212. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  213. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  214. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) =======
  215. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  216. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======
  217. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  218. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  219. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) =======
  220. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  221. 12 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= =======
  222. 12 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= ======= =======
  223. 12 >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) =======
  224. 12 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price)
  225. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  226. 12 =======
  227. 12 >>>>>>> 9620751 (Featire specs) =======
  228. 12 >>>>>>> 9dc109d (Featire specs) =======
  229. 7 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  230. 7 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  231. 7 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= <<<<<<< HEAD
  232. 7 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) =======
  233. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  234. 7 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  235. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  236. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  237. 7 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  238. 7 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  239. 12 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) >>>>>>> bc0ff2c (Featire specs) Book.order(params[:sort]) ======= Book.all.order(params[:sort]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= Book.order(params[:sort]) >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Book.order(params[:sort]) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= Book.order(params[:sort]) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= Book.all.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= Book.order(params[:sort]) >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= Book.order(params[:sort]) >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= Book.order(params[:sort]) >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= Book.order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) Book.order(params[:sort]) ======= Book.all.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= Book.order(params[:sort]) >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= Book.order(params[:sort]) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= Book.all.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= Book.all.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= Book.order(params[:sort]) >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= Book.order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) Book.order(params[:sort]) ======= Book.all.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= Book.order(params[:sort]) >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= Book.order(params[:sort]) ======= Book.all.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= Book.all.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= Book.order(params[:sort]) >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  240. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price)
  241. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  242. =======
  243. >>>>>>> 752f0c0 (Featire specs) =======
  244. >>>>>>> 4e81ea2 (Featire specs) =======
  245. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= =======
  246. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  247. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs)
  248. =======
  249. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  250. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= =======
  251. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= =======
  252. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= =======
  253. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= =======
  254. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  255. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  256. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs)
  257. =======
  258. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= =======
  259. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= =======
  260. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= =======
  261. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= =======
  262. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= =======
  263. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 13fd74f (Featire specs) ======= =======
  264. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  265. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  266. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= =======
  267. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
  268. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  269. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 20256f8 (Featire specs) ======= =======
  270. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  271. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  272. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> b35d1f8 (Featire specs)
  273. =======
  274. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
  275. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
  276. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======
  277. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= =======
  278. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======
  279. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= =======
  280. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  281. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  282. >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= =======
  283. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  284. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  285. >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  286. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) else
  287. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price)
  288. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  289. =======
  290. >>>>>>> 752f0c0 (Featire specs) =======
  291. >>>>>>> 4e81ea2 (Featire specs) =======
  292. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= =======
  293. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  294. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price)
  295. =======
  296. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  297. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= =======
  298. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= =======
  299. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= =======
  300. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= =======
  301. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  302. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  303. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
  304. =======
  305. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  306. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  307. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= =======
  308. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  309. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  310. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  311. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  312. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  313. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  314. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  315. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
  316. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= =======
  317. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= =======
  318. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= =======
  319. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  320. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  321. =======
  322. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
  323. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
  324. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= =======
  325. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======
  326. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= =======
  327. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======
  328. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= =======
  329. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  330. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  331. >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  332. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  333. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= =======
  334. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= =======
  335. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= =======
  336. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  337. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= =======
  338. =======
  339. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
  340. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
  341. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= =======
  342. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
  343. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= =======
  344. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= =======
  345. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= =======
  346. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  347. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  348. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= Category.find(params[:category]).books.order(params[:sort]) >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }).order(params[:sort]) >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  349. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price)
  350. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  351. =======
  352. >>>>>>> 752f0c0 (Featire specs) =======
  353. >>>>>>> 4e81ea2 (Featire specs) =======
  354. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= =======
  355. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  356. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs)
  357. =======
  358. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  359. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= =======
  360. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= =======
  361. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= =======
  362. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= =======
  363. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  364. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  365. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs)
  366. =======
  367. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= =======
  368. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= =======
  369. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= =======
  370. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= =======
  371. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= =======
  372. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 13fd74f (Featire specs) ======= =======
  373. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  374. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  375. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= =======
  376. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
  377. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  378. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 20256f8 (Featire specs) ======= =======
  379. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  380. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  381. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> b35d1f8 (Featire specs)
  382. =======
  383. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
  384. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
  385. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======
  386. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= =======
  387. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======
  388. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= =======
  389. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  390. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  391. >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= =======
  392. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  393. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  394. >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  395. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) end
  396. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  397. 18 ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  398. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  399. =======
  400. >>>>>>> 752f0c0 (Featire specs) =======
  401. >>>>>>> 4e81ea2 (Featire specs) =======
  402. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= =======
  403. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix)
  404. 18 ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix)
  405. 18 ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix)
  406. 18 ======= ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  407. 18 elsif params[:category].nil?
  408. 16 Book.all
  409. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= =======
  410. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= =======
  411. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  412. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) elsif params[:category].nil?
  413. 16 Book.all
  414. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= =======
  415. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= =======
  416. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
  417. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) elsif params[:category].nil?
  418. 16 Book.all
  419. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= =======
  420. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= =======
  421. >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) elsif params[:category].nil?
  422. 16 Book.all
  423. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= =======
  424. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  425. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  426. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) >>>>>>> b832d45 (Featire specs) ======= =======
  427. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) ======= =======
  428. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  429. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= =======
  430. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) >>>>>>> d96cf3b (Featire specs) elsif params[:category].nil?
  431. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  432. 16 ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 27ceb6f (Add login registration pages)
  433. 17 <<<<<<< HEAD ======= =======
  434. 18 >>>>>>> 1214e1f (Add login registration pages) =======
  435. 17 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  436. 17 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 27ceb6f (Add login registration pages) ======= =======
  437. 18 >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======
  438. 2 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs)
  439. 2 =======
  440. 17 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= =======
  441. 17 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 113da87 (Featire specs) ======= =======
  442. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= =======
  443. 18 >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Book.all ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 12bcf81 (Featire specs) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> ee78f39 (Rebased) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 836a973 (Rebased) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 1577aeb (Rebased) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs)
  444. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs)
  445. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  446. =======
  447. >>>>>>> 752f0c0 (Featire specs) =======
  448. >>>>>>> 4e81ea2 (Featire specs) =======
  449. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  450. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  451. >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 8c32a77 (Featire specs)
  452. =======
  453. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  454. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  455. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) =======
  456. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= =======
  457. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= =======
  458. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= =======
  459. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= =======
  460. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= =======
  461. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= =======
  462. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= =======
  463. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  464. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) else
  465. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages)
  466. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) =======
  467. 2 >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 22ee41c (Add login registration pages) >>>>>>> fd3e35e (Featire specs)
  468. =======
  469. >>>>>>> 752f0c0 (Featire specs) =======
  470. >>>>>>> 4e81ea2 (Featire specs) 17 =======
  471. 18 >>>>>>> 1214e1f (Add login registration pages) =======
  472. 17 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  473. 17 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5affcb (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57da3ff (Add login registration pages) ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages)
  474. 18 >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> c54769d (Fix book_spec decrease quantity and price) =======
  475. 2 <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs)
  476. 2 =======
  477. 2 >>>>>>> 9620751 (Featire specs) =======
  478. 17 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  479. 17 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  480. 17 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD
  481. 17 <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 852864e (Add login registration pages) =======
  482. 17 <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) =======
  483. 17 <<<<<<< HEAD ======= >>>>>>> 3dc272d (Featire specs) =======
  484. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) =======
  485. 17 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  486. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  487. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  488. 18 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> 872e675 (Fix) =======
  489. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) =======
  490. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= =======
  491. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= =======
  492. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= =======
  493. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= =======
  494. 18 >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= =======
  495. 17 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  496. 17 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= =======
  497. 18 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1a9aba9 (Fix) =======
  498. 2 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  499. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= =======
  500. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  501. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  502. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  503. 18 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= =======
  504. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= =======
  505. 17 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  506. 17 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= =======
  507. 18 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) =======
  508. 18 >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= =======
  509. 17 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  510. 17 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  511. 17 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) =======
  512. 18 >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= =======
  513. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= =======
  514. 17 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  515. 17 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= =======
  516. 18 >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) <<<<<<< HEAD Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 904663c (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= ======= params[:category].nil? ? Book.all : Category.find(params[:category]).books >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= Book.joins(:books_categories).where(books_categories: { category_id: params[:category] }) >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix)
  517. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  518. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  519. =======
  520. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= ======= ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  521. >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  522. >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  523. >>>>>>> 05602ed (Fix book_spec decrease quantity and price) >>>>>>> 94841b5 (Featire specs) =======
  524. >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) =======
  525. >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) =======
  526. >>>>>>> 13fd74f (Featire specs) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  527. >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  528. >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  529. >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) >>>>>>> 3b03895 (Featire specs) =======
  530. >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) =======
  531. >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) =======
  532. >>>>>>> 64d4167 (Featire specs) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  533. >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  534. >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  535. >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) >>>>>>> e54deeb (Featire specs) =======
  536. >>>>>>> ee5242b (Featire specs) ======= >>>>>>> e54deeb (Featire specs) =======
  537. >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) =======
  538. >>>>>>> ed6aebd (Featire specs) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  539. ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  540. >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  541. >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  542. >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) =======
  543. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  544. ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  545. >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  546. >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  547. >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD =======
  548. ======= >>>>>>> df37394 (Featire specs) =======
  549. ======= >>>>>>> 715fac2 (Featire specs) =======
  550. ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  551. =======
  552. >>>>>>> 752f0c0 (Featire specs) =======
  553. >>>>>>> 4e81ea2 (Featire specs) =======
  554. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= =======
  555. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  556. >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs)
  557. =======
  558. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  559. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  560. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  561. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  562. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  563. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  564. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  565. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  566. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs)
  567. =======
  568. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  569. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  570. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  571. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  572. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  573. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  574. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  575. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  576. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  577. >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> bcd09ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  578. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
  579. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= =======
  580. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= =======
  581. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= =======
  582. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  583. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs)
  584. =======
  585. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
  586. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
  587. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======
  588. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= =======
  589. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======
  590. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= =======
  591. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  592. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  593. >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  594. >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> a1fe6da (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  595. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  596. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= =======
  597. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= =======
  598. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= =======
  599. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  600. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= =======
  601. =======
  602. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
  603. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
  604. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
  605. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= =======
  606. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= =======
  607. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= =======
  608. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  609. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  610. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) end
  611. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  612. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 1a9aba9 (Fix)
  613. =======
  614. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  615. >>>>>>> 94841b5 (Featire specs) =======
  616. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  617. >>>>>>> 3b03895 (Featire specs) =======
  618. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  619. >>>>>>> e54deeb (Featire specs) =======
  620. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  621. >>>>>>> 9c0d812 (Featire specs) =======
  622. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  623. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD =======
  624. ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
  625. =======
  626. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  627. >>>>>>> 94841b5 (Featire specs) =======
  628. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  629. >>>>>>> 3b03895 (Featire specs) =======
  630. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  631. >>>>>>> e54deeb (Featire specs) =======
  632. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  633. >>>>>>> 9c0d812 (Featire specs) =======
  634. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  635. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD =======
  636. ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price)
  637. =======
  638. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  639. >>>>>>> 94841b5 (Featire specs) =======
  640. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  641. >>>>>>> 3b03895 (Featire specs) =======
  642. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  643. >>>>>>> e54deeb (Featire specs) =======
  644. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  645. >>>>>>> 9c0d812 (Featire specs) =======
  646. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  647. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD =======
  648. ======= >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  649. =======
  650. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  651. >>>>>>> 9c0d812 (Featire specs) =======
  652. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  653. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  654. =======
  655. >>>>>>> 752f0c0 (Featire specs) =======
  656. >>>>>>> 4e81ea2 (Featire specs) =======
  657. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  658. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  659. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  660. =======
  661. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= =======
  662. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= =======
  663. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  664. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  665. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  666. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  667. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  668. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  669. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  670. =======
  671. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  672. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  673. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  674. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  675. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  676. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  677. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  678. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  679. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  680. >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  681. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
  682. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= =======
  683. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= =======
  684. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= =======
  685. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  686. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  687. =======
  688. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
  689. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
  690. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======
  691. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= =======
  692. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======
  693. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= =======
  694. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  695. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  696. >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  697. >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  698. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  699. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= =======
  700. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= =======
  701. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= =======
  702. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  703. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= =======
  704. =======
  705. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
  706. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
  707. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
  708. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= =======
  709. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= =======
  710. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= =======
  711. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  712. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  713. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) end
  714. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  715. ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 1a9aba9 (Fix)
  716. =======
  717. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  718. >>>>>>> 94841b5 (Featire specs) =======
  719. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  720. >>>>>>> 3b03895 (Featire specs) =======
  721. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  722. >>>>>>> e54deeb (Featire specs) =======
  723. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  724. >>>>>>> 9c0d812 (Featire specs) =======
  725. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  726. >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD =======
  727. ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price)
  728. =======
  729. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  730. >>>>>>> 94841b5 (Featire specs) =======
  731. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  732. >>>>>>> 3b03895 (Featire specs) =======
  733. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  734. >>>>>>> e54deeb (Featire specs) =======
  735. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  736. >>>>>>> 9c0d812 (Featire specs) =======
  737. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  738. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD =======
  739. ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price)
  740. =======
  741. >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  742. >>>>>>> 94841b5 (Featire specs) =======
  743. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  744. >>>>>>> 3b03895 (Featire specs) =======
  745. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  746. >>>>>>> e54deeb (Featire specs) =======
  747. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  748. >>>>>>> 9c0d812 (Featire specs) =======
  749. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  750. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) <<<<<<< HEAD =======
  751. ======= >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  752. =======
  753. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  754. >>>>>>> 9c0d812 (Featire specs) =======
  755. >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) =======
  756. >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  757. =======
  758. >>>>>>> 752f0c0 (Featire specs) =======
  759. >>>>>>> 4e81ea2 (Featire specs) =======
  760. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  761. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  762. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs)
  763. =======
  764. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= =======
  765. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= =======
  766. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  767. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  768. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  769. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  770. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  771. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  772. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  773. =======
  774. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  775. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= =======
  776. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= =======
  777. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  778. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= =======
  779. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  780. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  781. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  782. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  783. >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  784. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
  785. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= =======
  786. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= =======
  787. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= =======
  788. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  789. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs)
  790. =======
  791. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
  792. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
  793. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======
  794. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= =======
  795. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======
  796. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= =======
  797. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  798. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  799. >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  800. >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  801. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  802. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= =======
  803. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= =======
  804. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= =======
  805. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  806. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= =======
  807. =======
  808. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
  809. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
  810. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
  811. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= =======
  812. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= =======
  813. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= =======
  814. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  815. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  816. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= =======

app/queries/order_query.rb

36.36% lines covered

11 relevant lines. 4 lines covered and 7 lines missed.
    
  1. 1 class OrderQuery
  2. 1 SORT_METHODS = ['created_at', 'created_at DESC', 'total_price DESC', 'total_price',
  3. 'status', 'status DESC'].freeze
  4. 1 ORDER_STATUS = %w[delivered confirmed created canceled].freeze
  5. 1 def self.query(params, current_user)
  6. if SORT_METHODS.include?(params[:sort].to_s)
  7. if params[:status].nil?
  8. Order.where(user_id: current_user.id, status: %i[delivered created confirmed canceled]).order(params[:sort])
  9. else
  10. Order.where(user_id: current_user.id, status: params[:status]).order(params[:sort])
  11. end
  12. elsif ORDER_STATUS.include?(params[:status].to_s)
  13. Order.where(user_id: current_user.id, status: params[:status])
  14. else
  15. Order.where(user_id: current_user.id, status: %i[delivered created confirmed canceled])
  16. end
  17. end
  18. end
>>>>>>> 25f3c50 (Add sort orders) >>>>>>> aa4fb26 (Add sort orders)

app/services/book_service.rb

88.89% lines covered

9 relevant lines. 8 lines covered and 1 lines missed.
    
  1. 1 class BookService
  2. 1 def self.quantity_update(params, product, order, book, coupon)
  3. 2 discount = 0
  4. 2 product.update(quantity: params[:quantity]) if params[:quantity].to_i <= book.quantity
  5. 2 discount = coupon.discount unless coupon.nil?
  6. 2 if product.save
  7. {
  8. 2 total_price: order.decorate.order_price(discount).to_s,
  9. sub_price: order.decorate.order_price.to_s,
  10. price: product.decorate.total_price.to_s,
  11. 2 discount: (order.decorate.order_price * discount).to_s,
  12. book_quantity: book.quantity
  13. }
  14. else
  15. { notice: 'Error!' }
  16. end
  17. end
  18. end

app/services/checkout_service.rb

50.0% lines covered

4 relevant lines. 2 lines covered and 2 lines missed.
    
  1. 1 class CheckoutService
  2. 1 def self.to_errors(message)
  3. message.map do |k, v|
  4. "#{k} #{v.join(', ')}"
  5. end.join("\n")
  6. end
  7. end

app/services/coupon_service.rb

81.82% lines covered

11 relevant lines. 9 lines covered and 2 lines missed.
    
  1. 1 class CouponService
  2. 1 def self.find_coupon(params, order, coupon)
  3. 4 error_message = I18n.t('order.coupon.error')
  4. 4 if coupon.nil?
  5. 1 error_message = ' ' if params[:code].eql?('')
  6. 1 { error: error_message, total_price: order.decorate.order_price.to_s }
  7. 3 elsif !coupon.is_active
  8. error_message = ' ' if params[:code].eql?('')
  9. { error: error_message, total_price: order.decorate.order_price.to_s }
  10. else
  11. 3 { total_price: order.decorate.order_price(coupon.discount).to_s,
  12. 3 discount: (order.decorate.order_price * coupon.discount).to_s }
  13. end
  14. end
  15. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= ======= >>>>>>> b8aab1a (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/application.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) 7 relevant lines. 7 lines covered and ======= 6 relevant lines. 6 lines covered and <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= 7 relevant lines. 7 lines covered and >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= 6 relevant lines. 6 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= 6 relevant lines. 6 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= 6 relevant lines. 6 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= 6 relevant lines. 6 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= 6 relevant lines. 6 lines covered and >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= 7 relevant lines. 7 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed.
    
  1. 1 require_relative 'boot'
  2. 1 require 'rails/all'
  3. # Require the gems listed in Gemfile, including any gems
  4. # you've limited to :test, :development, or :production.
  5. 1 Bundler.require(*Rails.groups)
  6. 1 module BookStore
  7. 1 class Application < Rails::Application
  8. # Initialize configuration defaults for originally generated Rails version.
  9. 1 config.load_defaults 6.1
  10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs)
  11. 1 =======
  12. <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) =======
  13. 1 >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= =======
  14. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= =======
  15. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= =======
  16. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= =======
  17. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= =======
  18. >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) =======
  19. 1 >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.autoloader = :classic ======= >>>>>>> cde4834 (Manifest_cache true) ======= config.autoloader = :classic >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) config.autoloader = :classic ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= config.autoloader = :classic >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  20. # Configuration for the application, engines, and railties goes here.
  21. #
  22. # These settings can be overridden in specific environments using the files
  23. # in config/environments, which are processed later.
  24. #
  25. # config.time_zone = "Central Time (US & Canada)"
  26. # config.eager_load_paths << Rails.root.join("extras")
  27. end
  28. end

config/boot.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed.
    
  1. 1 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
  2. 1 require 'bundler/setup' # Set up gems listed in the Gemfile.
  3. 1 require 'bootsnap/setup' # Speed up boot time by caching expensive operations.

config/environment.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. # Load the Rails application.
  2. 1 require_relative 'application'
  3. # Initialize the Rails application.
  4. 1 Rails.application.initialize!

config/environments/test.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) 19 relevant lines. 19 lines covered and ======= 18 relevant lines. 18 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= 19 relevant lines. 19 lines covered and >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> bebaea7 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 18 relevant lines. 18 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 19 relevant lines. 19 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed.
    
  1. 1 require 'active_support/core_ext/integer/time'
  2. # The test environment is used exclusively to run your application's
  3. # test suite. You never need to work with it otherwise. Remember that
  4. # your test database is "scratch space" for the test suite and is wiped
  5. # and recreated between test runs. Don't rely on the data there!
  6. 1 Rails.application.configure do
  7. # Settings specified here will take precedence over those in config/application.rb.
  8. 1 config.cache_classes = false
  9. 1 config.action_view.cache_template_loading = true
  10. # Do not eager load code on boot. This avoids loading your whole application
  11. # just for the purpose of running a single test. If you are using a tool that
  12. # preloads Rails for running tests, you may have to set it to true.
  13. 1 config.eager_load = false
  14. # Configure public file server for tests with Cache-Control for performance.
  15. 1 config.public_file_server.enabled = true
  16. 1 config.public_file_server.headers = {
  17. 'Cache-Control' => "public, max-age=#{1.hour.to_i}"
  18. }
  19. # Show full error reports and disable caching.
  20. 1 config.consider_all_requests_local = true
  21. 1 config.action_controller.perform_caching = false
  22. 1 config.cache_store = :null_store
  23. # Raise exceptions instead of rendering exception templates.
  24. 1 config.action_dispatch.show_exceptions = false
  25. # Disable request forgery protection in test environment.
  26. 1 config.action_controller.allow_forgery_protection = false
  27. # Store uploaded files on the local file system in a temporary directory.
  28. 1 config.active_storage.service = :test
  29. 1 config.action_mailer.perform_caching = false
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs)
  31. 1 =======
  32. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) =======
  33. 1 >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) =======
  34. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) =======
  35. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) =======
  36. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) =======
  37. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) =======
  38. 1 >>>>>>> bebaea7 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======
  39. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) =======
  40. 1 >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) =======
  41. 1 >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======
  42. 1 >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= >>>>>>> cde4834 (Manifest_cache true) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> bebaea7 (Rebased) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 1a9aba9 (Fix) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 49e3b70 (Fix) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= config.action_mailer.default_url_options = { host: 'localhost', port: 3000 } >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  43. # Tell Action Mailer not to deliver emails to the real world.
  44. # The :test delivery method accumulates sent emails in the
  45. # ActionMailer::Base.deliveries array.
  46. 1 config.action_mailer.delivery_method = :test
  47. # Print deprecation notices to the stderr.
  48. 1 config.active_support.deprecation = :stderr
  49. # Raise exceptions for disallowed deprecations.
  50. 1 config.active_support.disallowed_deprecation = :raise
  51. # Tell Active Support which deprecation messages to disallow.
  52. 1 config.active_support.disallowed_deprecation_warnings = []
  53. # Raises error for missing translations.
  54. # config.i18n.raise_on_missing_translations = true
  55. # Annotate rendered view with file names.
  56. # config.action_view.annotate_rendered_view_with_filenames = true
  57. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/active_admin.rb

100.0% lines covered

11 relevant lines. 11 lines covered and 0 lines missed.
    
  1. 1 ActiveAdmin.setup do |config|
  2. 1 config.site_title = 'Book Store'
  3. 1 config.authentication_method = :authenticate_admin_user!
  4. 1 config.current_user_method = :current_admin_user
  5. 1 config.logout_link_path = :destroy_admin_user_session_path
  6. 1 config.batch_actions = true
  7. 1 config.filter_attributes = %i[encrypted_password password password_confirmation]
  8. 1 config.localize_format = :long
  9. 1 config.default_per_page = 30
  10. 1 config.max_per_page = 10_000
  11. 1 config.use_webpacker = true
  12. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/application_controller_renderer.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # ActiveSupport::Reloader.to_prepare do
  3. # ApplicationController.renderer.defaults.merge!(
  4. # http_host: 'example.org',
  5. # https: false
  6. # )
  7. # end

config/initializers/assets.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # Version of your assets, change this if you want to expire all your assets.
  3. 1 Rails.application.config.assets.version = '1.0'
  4. # Add additional assets to the asset load path.
  5. # Rails.application.config.assets.paths << Emoji.images_path
  6. # Add Yarn node_modules folder to the asset load path.
  7. 1 Rails.application.config.assets.paths << Rails.root.join('node_modules')
  8. # Precompile additional assets.
  9. # application.js, application.css, and all non-JS/CSS in the app/assets
  10. # folder are already added.
  11. # Rails.application.config.assets.precompile += %w( admin.js admin.css )

config/initializers/backtrace_silencers.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
  3. # Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
  4. # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
  5. # by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
  6. 1 Rails.backtrace_cleaner.remove_silencers! if ENV['BACKTRACE']

config/initializers/content_security_policy.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # Define an application-wide content security policy
  3. # For further information see the following documentation
  4. # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
  5. # Rails.application.config.content_security_policy do |policy|
  6. # policy.default_src :self, :https
  7. # policy.font_src :self, :https, :data
  8. # policy.img_src :self, :https, :data
  9. # policy.object_src :none
  10. # policy.script_src :self, :https
  11. # policy.style_src :self, :https
  12. # # If you are using webpack-dev-server then specify webpack-dev-server host
  13. # policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
  14. # # Specify URI for violation reports
  15. # # policy.report_uri "/csp-violation-report-endpoint"
  16. # end
  17. # If you are using UJS then enable automatic nonce generation
  18. # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
  19. # Set the nonce only to specific directives
  20. # Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
  21. # Report CSP violations to a specified URI
  22. # For further information see the following documentation:
  23. # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
  24. # Rails.application.config.content_security_policy_report_only = true

config/initializers/cookies_serializer.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # Specify a serializer for the signed and encrypted cookie jars.
  3. # Valid options are :json, :marshal, and :hybrid.
  4. 1 Rails.application.config.action_dispatch.cookies_serializer = :json
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/devise.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) 14 relevant lines. 14 lines covered and ======= 13 relevant lines. 13 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= 14 relevant lines. 14 lines covered and >>>>>>> d780a52 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> d52ad35 (Rebased) ======= 13 relevant lines. 13 lines covered and >>>>>>> df37394 (Featire specs) ======= 14 relevant lines. 14 lines covered and >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> 1d59aaa (Fix) ======= 13 relevant lines. 13 lines covered and >>>>>>> 715fac2 (Featire specs) ======= 14 relevant lines. 14 lines covered and >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> 078304c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> 1ac6be1 (Fix) ======= 13 relevant lines. 13 lines covered and >>>>>>> 3dc272d (Featire specs) ======= 14 relevant lines. 14 lines covered and >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= 14 relevant lines. 14 lines covered and >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= 13 relevant lines. 13 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed.
    
  1. # frozen_string_literal: true
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages)
  3. 1 =======
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) =======
  5. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) =======
  6. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) =======
  7. 1 >>>>>>> d52ad35 (Rebased) =======
  8. >>>>>>> df37394 (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) =======
  9. 1 >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) =======
  10. >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) =======
  11. 1 >>>>>>> 1d59aaa (Fix) =======
  12. >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) =======
  13. 1 >>>>>>> 078304c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) =======
  14. 1 >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) =======
  15. 1 >>>>>>> 1ac6be1 (Fix) =======
  16. >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) =======
  17. 1 >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) =======
  18. 1 >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) =======
  19. 1 >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) =======
  20. 1 >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) Devise.setup do |config| <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Assuming you have not yet modified this file, each configuration option below <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> 1214e1f (Add login registration pages) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> df37394 (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 715fac2 (Featire specs) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 45f9f35 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) >>>>>>> db0e854 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 26b462d (Add login registration pages) >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 3dc272d (Featire specs) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 65459e8 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 26b462d (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 26b462d (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 055b00f (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e7ec208 (Add login registration pages) ======= ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 26b462d (Add login registration pages) >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  21. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  22. >>>>>>> d96cf3b (Featire specs) =======
  23. >>>>>>> df37394 (Featire specs) =======
  24. >>>>>>> 715fac2 (Featire specs) =======
  25. >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' ======= # is set to its default value. Note that some are commented out while others >>>>>>> d96cf3b (Featire specs) ======= # is set to its default value. Note that some are commented out while others >>>>>>> df37394 (Featire specs) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 715fac2 (Featire specs) ======= # is set to its default value. Note that some are commented out while others >>>>>>> 3dc272d (Featire specs)
  26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  27. 1 =======
  28. >>>>>>> d96cf3b (Featire specs) =======
  29. >>>>>>> df37394 (Featire specs) =======
  30. >>>>>>> 715fac2 (Featire specs) =======
  31. >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD require 'devise/orm/active_record' ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> d96cf3b (Featire specs) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> df37394 (Featire specs) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 715fac2 (Featire specs) ======= # are not: uncommented lines are intended to protect your configuration from >>>>>>> 3dc272d (Featire specs)
  32. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  33. 1 =======
  34. >>>>>>> d96cf3b (Featire specs) =======
  35. >>>>>>> df37394 (Featire specs) =======
  36. >>>>>>> 715fac2 (Featire specs) =======
  37. >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> d96cf3b (Featire specs) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> df37394 (Featire specs) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 715fac2 (Featire specs) ======= # breaking changes in upgrades (i.e., in the event that future versions of >>>>>>> 3dc272d (Featire specs)
  38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  39. 1 =======
  40. >>>>>>> d96cf3b (Featire specs) =======
  41. >>>>>>> df37394 (Featire specs) =======
  42. >>>>>>> 715fac2 (Featire specs) =======
  43. >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= # Devise change the default values for those options). >>>>>>> d96cf3b (Featire specs) ======= # Devise change the default values for those options). >>>>>>> df37394 (Featire specs) ======= # Devise change the default values for those options). >>>>>>> 715fac2 (Featire specs) ======= # Devise change the default values for those options). >>>>>>> 3dc272d (Featire specs)
  44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  45. 1 =======
  46. >>>>>>> d96cf3b (Featire specs) =======
  47. >>>>>>> df37394 (Featire specs) =======
  48. >>>>>>> 715fac2 (Featire specs) =======
  49. >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.skip_session_storage = [:http_auth] ======= # >>>>>>> d96cf3b (Featire specs) ======= # >>>>>>> df37394 (Featire specs) ======= # >>>>>>> 715fac2 (Featire specs) ======= # >>>>>>> 3dc272d (Featire specs)
  50. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  51. 1 =======
  52. >>>>>>> d96cf3b (Featire specs) =======
  53. >>>>>>> df37394 (Featire specs) =======
  54. >>>>>>> 715fac2 (Featire specs) =======
  55. >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.stretches = Rails.env.test? ? 1 : 12 ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> d96cf3b (Featire specs) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> df37394 (Featire specs) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 715fac2 (Featire specs) ======= # Use this hook to configure devise mailer, warden hooks and so forth. >>>>>>> 3dc272d (Featire specs)
  56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  57. 1 =======
  58. >>>>>>> d96cf3b (Featire specs) =======
  59. >>>>>>> df37394 (Featire specs) =======
  60. >>>>>>> 715fac2 (Featire specs) =======
  61. >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reconfirmable = true ======= # Many of these configuration options can be set straight in your model. >>>>>>> d96cf3b (Featire specs) ======= # Many of these configuration options can be set straight in your model. >>>>>>> df37394 (Featire specs) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 715fac2 (Featire specs) ======= # Many of these configuration options can be set straight in your model. >>>>>>> 3dc272d (Featire specs)
  62. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  63. >>>>>>> d780a52 (Rebased) =======
  64. >>>>>>> ee78f39 (Rebased) =======
  65. >>>>>>> 836a973 (Rebased) =======
  66. >>>>>>> 1577aeb (Rebased) 1 ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 264ef06 (Add login registration pages) ======= 1 >>>>>>> df37394 (Featire specs) ======= 1 >>>>>>> 715fac2 (Featire specs) ======= 1 >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.expire_all_remember_me_on_sign_out = true ======= Devise.setup do |config| >>>>>>> d96cf3b (Featire specs) ======= Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 264ef06 (Add login registration pages) ======= Devise.setup do |config| >>>>>>> df37394 (Featire specs) ======= Devise.setup do |config| >>>>>>> 715fac2 (Featire specs) ======= Devise.setup do |config| >>>>>>> 3dc272d (Featire specs)
  67. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  68. 1 =======
  69. >>>>>>> d96cf3b (Featire specs) =======
  70. >>>>>>> df37394 (Featire specs) =======
  71. >>>>>>> 715fac2 (Featire specs) =======
  72. >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.password_length = 6..128 ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> d96cf3b (Featire specs) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> df37394 (Featire specs) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 715fac2 (Featire specs) ======= # The secret key used by Devise. Devise uses this key to generate >>>>>>> 3dc272d (Featire specs)
  73. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  74. 1 =======
  75. >>>>>>> d96cf3b (Featire specs) =======
  76. >>>>>>> df37394 (Featire specs) =======
  77. >>>>>>> 715fac2 (Featire specs) =======
  78. >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ ======= # random tokens. Changing this key will render invalid all existing >>>>>>> d96cf3b (Featire specs) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> df37394 (Featire specs) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 715fac2 (Featire specs) ======= # random tokens. Changing this key will render invalid all existing >>>>>>> 3dc272d (Featire specs)
  79. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  80. 1 =======
  81. >>>>>>> d96cf3b (Featire specs) =======
  82. >>>>>>> df37394 (Featire specs) =======
  83. >>>>>>> 715fac2 (Featire specs) =======
  84. >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.reset_password_within = 6.hours ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> d96cf3b (Featire specs) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> df37394 (Featire specs) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 715fac2 (Featire specs) ======= # confirmation, reset password and unlock tokens in the database. >>>>>>> 3dc272d (Featire specs)
  85. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  86. 1 =======
  87. >>>>>>> d96cf3b (Featire specs) =======
  88. >>>>>>> df37394 (Featire specs) =======
  89. >>>>>>> 715fac2 (Featire specs) =======
  90. >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.sign_out_via = :delete ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> d96cf3b (Featire specs) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> df37394 (Featire specs) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 715fac2 (Featire specs) ======= # Devise will use the `secret_key_base` as its `secret_key` >>>>>>> 3dc272d (Featire specs)
  91. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  92. 1 =======
  93. >>>>>>> d96cf3b (Featire specs) =======
  94. >>>>>>> df37394 (Featire specs) =======
  95. >>>>>>> 715fac2 (Featire specs) =======
  96. >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.omniauth :facebook, ======= # by default. You can change it below and use your own secret key. >>>>>>> d96cf3b (Featire specs) ======= # by default. You can change it below and use your own secret key. >>>>>>> df37394 (Featire specs) ======= # by default. You can change it below and use your own secret key. >>>>>>> 715fac2 (Featire specs) ======= # by default. You can change it below and use your own secret key. >>>>>>> 3dc272d (Featire specs)
  97. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_ID), ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> d96cf3b (Featire specs) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> df37394 (Featire specs) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 715fac2 (Featire specs) ======= # config.secret_key = 'b0412bb2e70b23477c2527471c87d55e4ca905e45d6533ac6a021ef302571810a86cd1b0c244fc8e83ef34f986e1b646bcd9cb7867b14799f6042ffc17267c24' >>>>>>> 3dc272d (Featire specs)
  98. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET), ======= >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs)
  99. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD scope: 'email', info_fields: 'email,name' ======= # ==> Controller configuration >>>>>>> d96cf3b (Featire specs) ======= # ==> Controller configuration >>>>>>> df37394 (Featire specs) ======= # ==> Controller configuration >>>>>>> 715fac2 (Featire specs) ======= # ==> Controller configuration >>>>>>> 3dc272d (Featire specs)
  100. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Configure the parent class to the devise controllers.
  101. # config.parent_controller = 'DeviseController'
  102. # ==> Mailer Configuration
  103. # Configure the e-mail address which will be shown in Devise::Mailer,
  104. # note that it will be overwritten if you use your own mailer class
  105. # with default "from" parameter.
  106. ======= ======= >>>>>>> 264ef06 (Add login registration pages)
  107. >>>>>>> d780a52 (Rebased) 1 ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 591c3b2 (Add login registration pages) =======
  108. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) =======
  109. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  110. >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
  111. 1 ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) <<<<<<< HEAD require 'devise/orm/active_record' ======= <<<<<<< HEAD Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> cb74525 (Add login registration pages)
  112. <<<<<<< HEAD
  113. 1 ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 039806b (Add login registration pages) <<<<<<< HEAD config.case_insensitive_keys = [:email] ======= <<<<<<< HEAD Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 039806b (Add login registration pages)
  114. <<<<<<< HEAD
  115. 1 ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) <<<<<<< HEAD config.strip_whitespace_keys = [:email] ======= <<<<<<< HEAD Devise.setup do |config| ======= # Assuming you have not yet modified this file, each configuration option below >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages)
  116. <<<<<<< HEAD
  117. 1 config.skip_session_storage = [:http_auth]
  118. 1 config.stretches = Rails.env.test? ? 1 : 12
  119. 1 config.reconfirmable = true
  120. 1 config.expire_all_remember_me_on_sign_out = true
  121. 1 config.password_length = 6..128
  122. 1 config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
  123. 1 config.reset_password_within = 6.hours
  124. 1 config.sign_out_via = :delete
  125. 1 config.omniauth :facebook,
  126. Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
  127. Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
  128. scope: 'email', info_fields: 'email,name'
  129. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> df37394 (Featire specs) # Configure the parent class to the devise controllers.
  130. # config.parent_controller = 'DeviseController'
  131. # ==> Mailer Configuration
  132. # Configure the e-mail address which will be shown in Devise::Mailer,
  133. # note that it will be overwritten if you use your own mailer class
  134. # with default "from" parameter.
  135. ======= ======= <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages)
  136. >>>>>>> ee78f39 (Rebased) 1 =======
  137. >>>>>>> 1214e1f (Add login registration pages) =======
  138. >>>>>>> 730a8ca (Add login registration pages) =======
  139. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) =======
  140. >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
  141. 1 require 'devise/orm/active_record'
  142. 1 config.case_insensitive_keys = [:email]
  143. 1 config.strip_whitespace_keys = [:email]
  144. 1 config.skip_session_storage = [:http_auth]
  145. # config.stretches = Rails.env.test? ? 1 : 1
  146. 1 config.reconfirmable = true
  147. 1 config.expire_all_remember_me_on_sign_out = true
  148. 1 config.password_length = 6..128
  149. 1 config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
  150. 1 config.reset_password_within = 6.hours
  151. 1 config.sign_out_via = :delete
  152. 1 config.omniauth :facebook,
  153. Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
  154. Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
  155. scope: 'email', info_fields: 'email,name'
  156. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 852864e (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 715fac2 (Featire specs) # Configure the parent class to the devise controllers.
  157. # config.parent_controller = 'DeviseController'
  158. # ==> Mailer Configuration
  159. # Configure the e-mail address which will be shown in Devise::Mailer,
  160. # note that it will be overwritten if you use your own mailer class
  161. # with default "from" parameter.
  162. =======
  163. >>>>>>> 836a973 (Rebased) 1 =======
  164. >>>>>>> 1214e1f (Add login registration pages) =======
  165. >>>>>>> 730a8ca (Add login registration pages) =======
  166. >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
  167. 1 require 'devise/orm/active_record'
  168. 1 config.case_insensitive_keys = [:email]
  169. 1 config.strip_whitespace_keys = [:email]
  170. 1 config.skip_session_storage = [:http_auth]
  171. 1 config.stretches = Rails.env.test? ? 1 : 12
  172. 1 config.reconfirmable = true
  173. 1 config.expire_all_remember_me_on_sign_out = true
  174. 1 config.password_length = 6..128
  175. 1 config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
  176. 1 config.reset_password_within = 6.hours
  177. 1 config.sign_out_via = :delete
  178. 1 config.omniauth :facebook,
  179. Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
  180. Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
  181. scope: 'email', info_fields: 'email,name'
  182. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 8c3e531 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 282f108 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> db0e854 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 3dc272d (Featire specs) # Configure the parent class to the devise controllers.
  183. # config.parent_controller = 'DeviseController'
  184. # ==> Mailer Configuration
  185. # Configure the e-mail address which will be shown in Devise::Mailer,
  186. # note that it will be overwritten if you use your own mailer class
  187. # with default "from" parameter.
  188. =======
  189. >>>>>>> 1577aeb (Rebased) 1 =======
  190. >>>>>>> 1214e1f (Add login registration pages) =======
  191. >>>>>>> 730a8ca (Add login registration pages) =======
  192. >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
  193. 1 require 'devise/orm/active_record'
  194. 1 config.case_insensitive_keys = [:email]
  195. 1 config.strip_whitespace_keys = [:email]
  196. 1 config.skip_session_storage = [:http_auth]
  197. 1 config.stretches = Rails.env.test? ? 1 : 12
  198. 1 config.reconfirmable = true
  199. 1 config.expire_all_remember_me_on_sign_out = true
  200. 1 config.password_length = 6..128
  201. 1 config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
  202. 1 config.reset_password_within = 6.hours
  203. 1 config.sign_out_via = :delete
  204. 1 config.omniauth :facebook,
  205. Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
  206. Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
  207. scope: 'email', info_fields: 'email,name'
  208. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> aeec696 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 61908af (Add login registration pages) # Configure the parent class to the devise controllers.
  209. # config.parent_controller = 'DeviseController'
  210. # ==> Mailer Configuration
  211. # Configure the e-mail address which will be shown in Devise::Mailer,
  212. # note that it will be overwritten if you use your own mailer class
  213. # with default "from" parameter.
  214. 1 config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
  215. # Configure the class responsible to send e-mails.
  216. # config.mailer = 'Devise::Mailer'
  217. # Configure the parent class responsible to send e-mails.
  218. # config.parent_mailer = 'ActionMailer::Base'
  219. # ==> ORM configuration
  220. # Load and configure the ORM. Supports :active_record (default) and
  221. # :mongoid (bson_ext recommended) by default. Other ORMs may be
  222. # available as additional gems.
  223. 1 require 'devise/orm/active_record'
  224. # ==> Configuration for any authentication mechanism
  225. # Configure which keys are used when authenticating a user. The default is
  226. # just :email. You can configure it to use [:username, :subdomain], so for
  227. # authenticating a user, both parameters are required. Remember that those
  228. # parameters are used only when authenticating and not when retrieving from
  229. # session. If you need permissions, you should implement that in a before filter.
  230. # You can also supply a hash where the value is a boolean determining whether
  231. # or not authentication should be aborted when the value is not present.
  232. # config.authentication_keys = [:email]
  233. # Configure parameters from the request object used for authentication. Each entry
  234. # given should be a request method and it will automatically be passed to the
  235. # find_for_authentication method and considered in your model lookup. For instance,
  236. # if you set :request_keys to [:subdomain], :subdomain will be used on authentication.
  237. # The same considerations mentioned for authentication_keys also apply to request_keys.
  238. # config.request_keys = []
  239. # Configure which authentication keys should be case-insensitive.
  240. # These keys will be downcased upon creating or modifying a user and when used
  241. # to authenticate or find a user. Default is :email.
  242. 1 config.case_insensitive_keys = [:email]
  243. # Configure which authentication keys should have whitespace stripped.
  244. # These keys will have whitespace before and after removed upon creating or
  245. # modifying a user and when used to authenticate or find a user. Default is :email.
  246. 1 config.strip_whitespace_keys = [:email]
  247. # Tell if authentication through request.params is enabled. True by default.
  248. # It can be set to an array that will enable params authentication only for the
  249. # given strategies, for example, `config.params_authenticatable = [:database]` will
  250. # enable it only for database (email + password) authentication.
  251. # config.params_authenticatable = true
  252. # Tell if authentication through HTTP Auth is enabled. False by default.
  253. # It can be set to an array that will enable http authentication only for the
  254. # given strategies, for example, `config.http_authenticatable = [:database]` will
  255. # enable it only for database authentication.
  256. # For API-only applications to support authentication "out-of-the-box", you will likely want to
  257. # enable this with :database unless you are using a custom strategy.
  258. # The supported strategies are:
  259. # :database = Support basic authentication with authentication key + password
  260. # config.http_authenticatable = false
  261. # If 401 status code should be returned for AJAX requests. True by default.
  262. # config.http_authenticatable_on_xhr = true
  263. # The realm used in Http Basic Authentication. 'Application' by default.
  264. # config.http_authentication_realm = 'Application'
  265. # It will change confirmation, password recovery and other workflows
  266. # to behave the same regardless if the e-mail provided was right or wrong.
  267. # Does not affect registerable.
  268. # config.paranoid = true
  269. # By default Devise will store the user in session. You can skip storage for
  270. # particular strategies by setting this option.
  271. # Notice that if you are skipping storage for all authentication paths, you
  272. # may want to disable generating routes to Devise's sessions controller by
  273. # passing skip: :sessions to `devise_for` in your config/routes.rb
  274. 1 config.skip_session_storage = [:http_auth]
  275. # By default, Devise cleans up the CSRF token on authentication to
  276. # avoid CSRF token fixation attacks. This means that, when using AJAX
  277. # requests for sign in and sign up, you need to get a new CSRF token
  278. # from the server. You can disable this option at your own risk.
  279. # config.clean_up_csrf_token_on_authentication = true
  280. # When false, Devise will not attempt to reload routes on eager load.
  281. # This can reduce the time taken to boot the app but if your application
  282. # requires the Devise mappings to be loaded during boot time the application
  283. # won't boot properly.
  284. # config.reload_routes = true
  285. # ==> Configuration for :database_authenticatable
  286. # For bcrypt, this is the cost for hashing the password and defaults to 12. If
  287. # using other algorithms, it sets how many times you want the password to be hashed.
  288. # The number of stretches used for generating the hashed password are stored
  289. # with the hashed password. This allows you to change the stretches without
  290. # invalidating existing passwords.
  291. #
  292. # Limiting the stretches to just one in testing will increase the performance of
  293. # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
  294. # a value less than 10 in other environments. Note that, for bcrypt (the default
  295. # algorithm), the cost increases exponentially with the number of stretches (e.g.
  296. # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation).
  297. 1 config.stretches = Rails.env.test? ? 1 : 12
  298. # Set up a pepper to generate the hashed password.
  299. # config.pepper = 'ceca2dd0db4a8ea4b0604585575dbae22182ecf60d97a87f4914cc23cfe747f8ff22aac7e416e94240a6fe3cfe3cea929d0a8278c66c5388d059bf5bcfdc8a27'
  300. # Send a notification to the original email when the user's email is changed.
  301. # config.send_email_changed_notification = false
  302. # Send a notification email when the user's password is changed.
  303. # config.send_password_change_notification = false
  304. # ==> Configuration for :confirmable
  305. # A period that the user is allowed to access the website even without
  306. # confirming their account. For instance, if set to 2.days, the user will be
  307. # able to access the website for two days without confirming their account,
  308. # access will be blocked just in the third day.
  309. # You can also set it to nil, which will allow the user to access the website
  310. # without confirming their account.
  311. # Default is 0.days, meaning the user cannot access the website without
  312. # confirming their account.
  313. # config.allow_unconfirmed_access_for = 2.days
  314. # A period that the user is allowed to confirm their account before their
  315. # token becomes invalid. For example, if set to 3.days, the user can confirm
  316. # their account within 3 days after the mail was sent, but on the fourth day
  317. # their account can't be confirmed with the token any more.
  318. # Default is nil, meaning there is no restriction on how long a user can take
  319. # before confirming their account.
  320. # config.confirm_within = 3.days
  321. # If true, requires any email changes to be confirmed (exactly the same way as
  322. # initial account confirmation) to be applied. Requires additional unconfirmed_email
  323. # db field (see migrations). Until confirmed, new email is stored in
  324. # unconfirmed_email column, and copied to email column on successful confirmation.
  325. 1 config.reconfirmable = true
  326. # Defines which key will be used when confirming an account
  327. # config.confirmation_keys = [:email]
  328. # ==> Configuration for :rememberable
  329. # The time the user will be remembered without asking for credentials again.
  330. # config.remember_for = 2.weeks
  331. # Invalidates all the remember me tokens when the user signs out.
  332. 1 config.expire_all_remember_me_on_sign_out = true
  333. # If true, extends the user's remember period when remembered via cookie.
  334. # config.extend_remember_period = false
  335. # Options to be passed to the created cookie. For instance, you can set
  336. # secure: true in order to force SSL only cookies.
  337. # config.rememberable_options = {}
  338. # ==> Configuration for :validatable
  339. # Range for password length.
  340. 1 config.password_length = 6..128
  341. # Email regex used to validate email formats. It simply asserts that
  342. # one (and only one) @ exists in the given string. This is mainly
  343. # to give user feedback and not to assert the e-mail validity.
  344. 1 config.email_regexp = /\A[^@\s]+@[^@\s]+\z/
  345. # ==> Configuration for :timeoutable
  346. # The time you want to timeout the user session without activity. After this
  347. # time the user will be asked for credentials again. Default is 30 minutes.
  348. # config.timeout_in = 30.minutes
  349. # ==> Configuration for :lockable
  350. # Defines which strategy will be used to lock an account.
  351. # :failed_attempts = Locks an account after a number of failed attempts to sign in.
  352. # :none = No lock strategy. You should handle locking by yourself.
  353. # config.lock_strategy = :failed_attempts
  354. # Defines which key will be used when locking and unlocking an account
  355. # config.unlock_keys = [:email]
  356. # Defines which strategy will be used to unlock an account.
  357. # :email = Sends an unlock link to the user email
  358. # :time = Re-enables login after a certain amount of time (see :unlock_in below)
  359. # :both = Enables both strategies
  360. # :none = No unlock strategy. You should handle unlocking by yourself.
  361. # config.unlock_strategy = :both
  362. # Number of authentication tries before locking an account if lock_strategy
  363. # is failed attempts.
  364. # config.maximum_attempts = 20
  365. # Time interval to unlock the account if :time is enabled as unlock_strategy.
  366. # config.unlock_in = 1.hour
  367. # Warn on the last attempt before the account is locked.
  368. # config.last_attempt_warning = true
  369. # ==> Configuration for :recoverable
  370. #
  371. # Defines which key will be used when recovering the password for an account
  372. # config.reset_password_keys = [:email]
  373. # Time interval you can reset your password with a reset password key.
  374. # Don't put a too small interval or your users won't have the time to
  375. # change their passwords.
  376. 1 config.reset_password_within = 6.hours
  377. # When set to false, does not sign a user in automatically after their password is
  378. # reset. Defaults to true, so a user is signed in automatically after a reset.
  379. # config.sign_in_after_reset_password = true
  380. # ==> Configuration for :encryptable
  381. # Allow you to use another hashing or encryption algorithm besides bcrypt (default).
  382. # You can use :sha1, :sha512 or algorithms from others authentication tools as
  383. # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20
  384. # for default behavior) and :restful_authentication_sha1 (then you should set
  385. # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper).
  386. #
  387. # Require the `devise-encryptable` gem when using anything other than bcrypt
  388. # config.encryptor = :sha512
  389. # ==> Scopes configuration
  390. # Turn scoped views on. Before rendering "sessions/new", it will first check for
  391. # "users/sessions/new". It's turned off by default because it's slower if you
  392. # are using only default views.
  393. # config.scoped_views = false
  394. # Configure the default scope given to Warden. By default it's the first
  395. # devise role declared in your routes (usually :user).
  396. # config.default_scope = :user
  397. # Set this configuration to false if you want /users/sign_out to sign out
  398. # only the current scope. By default, Devise signs out all scopes.
  399. # config.sign_out_all_scopes = true
  400. # ==> Navigation configuration
  401. # Lists the formats that should be treated as navigational. Formats like
  402. # :html, should redirect to the sign in page when the user does not have
  403. # access, but formats like :xml or :json, should return 401.
  404. #
  405. # If you have any extra navigational formats, like :iphone or :mobile, you
  406. # should add them to the navigational formats lists.
  407. #
  408. # The "*/*" below is required to match Internet Explorer requests.
  409. # config.navigational_formats = ['*/*', :html]
  410. # The default HTTP method used to sign out a resource. Default is :delete.
  411. 1 config.sign_out_via = :delete
  412. # ==> OmniAuth
  413. # Add a new OmniAuth provider. Check the wiki for more information on setting
  414. # up on your models and hooks.
  415. # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo'
  416. # ==> Warden configuration
  417. # If you want to use other strategies, that are not supported by Devise, or
  418. # change the failure app, you can configure them inside the config.warden block.
  419. #
  420. # config.warden do |manager|
  421. # manager.intercept_401 = false
  422. # manager.default_strategies(scope: :user).unshift :some_external_strategy
  423. # end
  424. # ==> Mountable engine configurations
  425. # When using Devise inside an engine, let's call it `MyEngine`, and this engine
  426. # is mountable, there are some extra configurations to be taken into account.
  427. # The following options are available, assuming the engine is mounted as:
  428. #
  429. # mount MyEngine, at: '/my_engine'
  430. #
  431. # The router that invoked `devise_for`, in the example above, would be:
  432. # config.router_name = :my_engine
  433. #
  434. # When using OmniAuth, Devise cannot automatically set OmniAuth path,
  435. # so you need to do it manually. For the users scope, it would be:
  436. # config.omniauth_path_prefix = '/my_engine/users/auth'
  437. # ==> Turbolinks configuration
  438. # If your app is using Turbolinks, Turbolinks::Controller needs to be included to make redirection work correctly:
  439. #
  440. # ActiveSupport.on_load(:devise_failure_app) do
  441. # include Turbolinks::Controller
  442. # end
  443. # ==> Configuration for :registerable
  444. # When set to false, does not sign a user in automatically after their password is
  445. # changed. Defaults to true, so a user is signed in automatically after changing a password.
  446. # config.sign_in_after_change_password = true
  447. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2471c87 (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 69eb97e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 089f8cf (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fd74f (Featire specs) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/filter_parameter_logging.rb

100.0% lines covered

1 relevant lines. 1 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # Configure sensitive parameters which will be filtered from the log file.
  3. 1 Rails.application.config.filter_parameters += %i[
  4. passw secret token _key crypt salt certificate otp ssn
  5. ]

config/initializers/inflections.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # Add new inflection rules using the following format. Inflections
  3. # are locale specific, and you may define rules for as many different
  4. # locales as you wish. All of these examples are active by default:
  5. # ActiveSupport::Inflector.inflections(:en) do |inflect|
  6. # inflect.plural /^(ox)$/i, '\1en'
  7. # inflect.singular /^(ox)en/i, '\1'
  8. # inflect.irregular 'person', 'people'
  9. # inflect.uncountable %w( fish sheep )
  10. # end
  11. # These inflection rules are supported but not enabled by default:
  12. # ActiveSupport::Inflector.inflections(:en) do |inflect|
  13. # inflect.acronym 'RESTful'
  14. # end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/kaminari.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 Kaminari.configure do |config|
  2. 1 config.page_method_name = :per_page_kaminari
  3. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/mime_types.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # Add new mime types for use in respond_to blocks:
  3. # Mime::Type.register "text/richtext", :rtf
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b6a32ab (Add login registration pages) <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> e50f73e (Add login registration pages) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 03c0867 (Add login registration pages) ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 27ceb6f (Add login registration pages) >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 58d403b (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> b575a28 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 5caffae (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
>>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) =======
>>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) =======
>>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased)

config/initializers/money.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed.
    
  1. 1 Money.locale_backend = :i18n
  2. 1 Money.rounding_mode = BigDecimal::ROUND_HALF_EVEN
  3. 1 Money.default_currency = Money::Currency.new('EUR')
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 45f9f35 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 65459e8 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 055b00f (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/omniauth.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) 3 relevant lines. 3 lines covered and ======= 2 relevant lines. 2 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d780a52 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> d52ad35 (Rebased) ======= 2 relevant lines. 2 lines covered and >>>>>>> df37394 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= 2 relevant lines. 2 lines covered and >>>>>>> 26b462d (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 1d59aaa (Fix) ======= 2 relevant lines. 2 lines covered and >>>>>>> 715fac2 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 078304c (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 1ac6be1 (Fix) ======= 2 relevant lines. 2 lines covered and >>>>>>> 3dc272d (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= 3 relevant lines. 3 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) OmniAuth.config.logger = Rails.logger
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 45f9f35 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 65459e8 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 055b00f (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e7ec208 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) Rails.application.config.middleware.use OmniAuth::Builder do
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. =======
  5. >>>>>>> d96cf3b (Featire specs) =======
  6. >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages)
  7. =======
  8. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= =======
  9. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= =======
  10. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) =======
  11. >>>>>>> d52ad35 (Rebased) =======
  12. >>>>>>> df37394 (Featire specs) =======
  13. >>>>>>> ee78f39 (Rebased) =======
  14. =======
  15. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= =======
  16. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= =======
  17. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) =======
  18. >>>>>>> 49e8a6c (Rebased) =======
  19. =======
  20. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= =======
  21. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= =======
  22. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= =======
  23. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) =======
  24. >>>>>>> 1d59aaa (Fix) =======
  25. >>>>>>> 715fac2 (Featire specs) =======
  26. >>>>>>> 836a973 (Rebased) =======
  27. =======
  28. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= =======
  29. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 45f9f35 (Add login registration pages) ======= =======
  30. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) =======
  31. >>>>>>> 078304c (Rebased) =======
  32. =======
  33. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= =======
  34. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= =======
  35. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= =======
  36. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) =======
  37. >>>>>>> 0b5b269 (Fix) =======
  38. =======
  39. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= =======
  40. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> db0e854 (Add login registration pages) ======= =======
  41. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 2cdd6f4 (Add login registration pages) ======= =======
  42. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 3a43955 (Add login registration pages) =======
  43. >>>>>>> 1ac6be1 (Fix) =======
  44. >>>>>>> 3dc272d (Featire specs) =======
  45. >>>>>>> 1577aeb (Rebased) =======
  46. =======
  47. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= =======
  48. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 65459e8 (Add login registration pages) ======= =======
  49. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) =======
  50. >>>>>>> bebaea7 (Rebased) =======
  51. =======
  52. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= =======
  53. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= =======
  54. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= =======
  55. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) =======
  56. >>>>>>> 1a9aba9 (Fix) =======
  57. =======
  58. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= =======
  59. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= =======
  60. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= =======
  61. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) =======
  62. >>>>>>> 49e3b70 (Fix) =======
  63. =======
  64. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= =======
  65. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 055b00f (Add login registration pages) ======= =======
  66. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e7ec208 (Add login registration pages) ======= =======
  67. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 61908af (Add login registration pages) =======
  68. >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> d96cf3b (Featire specs) ======= provider :facebook, >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= provider :facebook, >>>>>>> d52ad35 (Rebased) ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> df37394 (Featire specs) ======= provider :facebook, >>>>>>> ee78f39 (Rebased) ======= provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= provider :facebook, >>>>>>> 49e8a6c (Rebased) ======= provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= provider :facebook, >>>>>>> 1d59aaa (Fix) ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 715fac2 (Featire specs) ======= provider :facebook, >>>>>>> 836a973 (Rebased) ======= provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 45f9f35 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= provider :facebook, >>>>>>> 078304c (Rebased) ======= provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= provider :facebook, >>>>>>> 0b5b269 (Fix) ======= provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) >>>>>>> db0e854 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 26b462d (Add login registration pages) >>>>>>> 3a43955 (Add login registration pages) ======= provider :facebook, >>>>>>> 1ac6be1 (Fix) ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 3dc272d (Featire specs) ======= provider :facebook, >>>>>>> 1577aeb (Rebased) ======= provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 65459e8 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= provider :facebook, >>>>>>> bebaea7 (Rebased) ======= provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 26b462d (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= provider :facebook, >>>>>>> 1a9aba9 (Fix) ======= provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 26b462d (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= provider :facebook, >>>>>>> 49e3b70 (Fix) ======= provider :facebook, ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 055b00f (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e7ec208 (Add login registration pages) ======= ======= provider :facebook, ENV['FACEBOOK_APP_ID'], ENV['FACEBOOK_APP_SECRET'] >>>>>>> 26b462d (Add login registration pages) >>>>>>> 61908af (Add login registration pages) ======= provider :facebook, >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  69. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  70. Rails.application.credentials.dig(:facebook, :FACEBOOK_ID),
  71. Rails.application.credentials.dig(:facebook, :FACEBOOK_SECRET),
  72. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD scope: 'public_profile, email', info_fields: 'email, first_name, last_name' ======= scope: 'email', info_fields: 'email,name' >>>>>>> 836a973 (Rebased) ======= scope: 'public_profile, email', info_fields: 'email, first_name, last_name' >>>>>>> 0b5b269 (Fix) ======= scope: 'email', info_fields: 'email,name' >>>>>>> 1577aeb (Rebased) ======= scope: 'public_profile, email', info_fields: 'email, first_name, last_name' >>>>>>> 1a9aba9 (Fix)
  73. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  74. >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> d780a52 (Rebased) ======= =======
  75. >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= =======
  76. >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= =======
  77. >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) =======
  78. >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= =======
  79. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= =======
  80. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= =======
  81. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= =======
  82. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 852864e (Add login registration pages) ======= =======
  83. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 551f3c1 (Add login registration pages) ======= =======
  84. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> ccec311 (Add login registration pages) ======= =======
  85. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) =======
  86. >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= =======
  87. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= =======
  88. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 45f9f35 (Add login registration pages) ======= =======
  89. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= =======
  90. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0fc3bf0 (Add login registration pages) ======= =======
  91. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> af9487a (Add login registration pages) ======= =======
  92. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 140c987 (Add login registration pages) ======= =======
  93. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= =======
  94. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 282f108 (Add login registration pages) ======= =======
  95. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> db0e854 (Add login registration pages) ======= =======
  96. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 2cdd6f4 (Add login registration pages) ======= =======
  97. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) =======
  98. >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= =======
  99. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 2471c87 (Add login registration pages) ======= =======
  100. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 65459e8 (Add login registration pages) ======= =======
  101. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= =======
  102. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) ======= =======
  103. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b5affcb (Add login registration pages) ======= =======
  104. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 4f7c979 (Add login registration pages) ======= =======
  105. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= =======
  106. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= =======
  107. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= =======
  108. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= =======
  109. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= =======
  110. >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages) ======= =======
  111. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 055b00f (Add login registration pages) ======= =======
  112. >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> e7ec208 (Add login registration pages) ======= =======
  113. >>>>>>> 26b462d (Add login registration pages) >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2471c87 (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 6a9fede (Add login registration pages) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 69eb97e (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 089f8cf (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 61908af (Add login registration pages) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 845289f (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fd74f (Featire specs) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> b26425c (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 845289f (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

config/initializers/permissions_policy.rb

100.0% lines covered

0 relevant lines. 0 lines covered and 0 lines missed.
    
  1. # Define an application-wide HTTP permissions policy. For further
  2. # information see https://developers.google.com/web/updates/2018/06/feature-policy
  3. #
  4. # Rails.application.config.permissions_policy do |f|
  5. # f.camera :none
  6. # f.gyroscope :none
  7. # f.microphone :none
  8. # f.usb :none
  9. # f.fullscreen :self
  10. # f.payment :self, "https://secure.example.com"
  11. # end

config/initializers/wrap_parameters.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. # Be sure to restart your server when you modify this file.
  2. # This file contains settings for ActionController::ParamsWrapper which
  3. # is enabled by default.
  4. # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
  5. 1 ActiveSupport.on_load(:action_controller) do
  6. 2 wrap_parameters format: [:json]
  7. end
  8. # To enable root element in JSON for ActiveRecord objects.
  9. # ActiveSupport.on_load(:active_record) do
  10. # self.include_root_in_json = true
  11. # end

config/routes.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 282f108 (Add login registration pages) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> db0e854 (Add login registration pages) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 2cdd6f4 (Add login registration pages) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3a43955 (Add login registration pages) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 055b00f (Add login registration pages) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e7ec208 (Add login registration pages) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 61908af (Add login registration pages) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> af9487a (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> b5affcb (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) 9 relevant lines. 9 lines covered and ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) 3 relevant lines. 3 lines covered and ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 27ceb6f (Add login registration pages) <<<<<<< HEAD 4 relevant lines. 4 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> af9487a (Add login registration pages) ======= 9 relevant lines. 9 lines covered and >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) 3 relevant lines. 3 lines covered and ======= ======= >>>>>>> 22ee41c (Add login registration pages) ======= 3 relevant lines. 3 lines covered and ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD 4 relevant lines. 4 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 551f3c1 (Add login registration pages) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 57da3ff (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cacbab9 (Add login registration pages) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9620751 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8be9029 (Add login registration pages) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD >>>>>>> 8c3e531 (Add login registration pages) ======= ======= 17 relevant lines. 17 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) >>>>>>> aeec696 (Add login registration pages) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9620751 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0c3a150 (Add login registration pages) ======= ======= >>>>>>> 1a9aba9 (Fix) ======= 17 relevant lines. 17 lines covered and >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5caffae (Add login registration pages) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 58d403b (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> b575a28 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 5caffae (Add login registration pages) >>>>>>> 569a007 (Add login registration pages) 17 relevant lines. 17 lines covered and ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 01d9256 (Add login registration pages) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0005d4a (Add login registration pages) <<<<<<< HEAD >>>>>>> 282f108 (Add login registration pages) ======= ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> ea0650c (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> b26425c (Add login registration pages) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 58d403b (Add login registration pages) <<<<<<< HEAD >>>>>>> db0e854 (Add login registration pages) ======= ======= >>>>>>> 58d403b (Add login registration pages) >>>>>>> a038b16 (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> 845289f (Add login registration pages) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b575a28 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2cdd6f4 (Add login registration pages) ======= ======= >>>>>>> b575a28 (Add login registration pages) >>>>>>> d7fadcd (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> 569a007 (Add login registration pages) ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 5caffae (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3a43955 (Add login registration pages) ======= ======= >>>>>>> 49e3b70 (Fix) ======= 18 relevant lines. 18 lines covered and >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= 3 relevant lines. 3 lines covered and >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) 9 relevant lines. 9 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) 9 relevant lines. 9 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> 9620751 (Featire specs) ======= ======= ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 0edd9b7 (Add login registration pages) 18 relevant lines. 18 lines covered and >>>>>>> 78d0719 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> f182ac7 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 2471c87 (Add login registration pages) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 65459e8 (Add login registration pages) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> a624084 (Add login registration pages) ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb955a0 (Add login registration pages) ======= ======= 9 relevant lines. 9 lines covered and >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> aeec696 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> b5affcb (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 4f7c979 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 0005d4a (Add login registration pages) >>>>>>> 01d9256 (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 58d403b (Add login registration pages) >>>>>>> b26425c (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= >>>>>>> b575a28 (Add login registration pages) >>>>>>> 845289f (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 569a007 (Add login registration pages) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 65f3409 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 65f3409 (Featire specs) ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD >>>>>>> 591c3b2 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 69eb97e (Add login registration pages) <<<<<<< HEAD >>>>>>> 055b00f (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> 089f8cf (Add login registration pages) <<<<<<< HEAD >>>>>>> e7ec208 (Add login registration pages) ======= ======= ======= 3 relevant lines. 3 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= ======= 4 relevant lines. 4 lines covered and >>>>>>> 26b462d (Add login registration pages) >>>>>>> 0edd9b7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 61908af (Add login registration pages) ======= ======= 18 relevant lines. 18 lines covered and >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) require 'sidekiq/web'
  2. 1 Rails.application.routes.draw do
  3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 0edd9b7 (Add login registration pages) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 089f8cf (Add login registration pages) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> 7a02bbe (Featire specs) root 'home#index' ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  4. <<<<<<< HEAD
  5. 1 <<<<<<< HEAD resources :books, only: %i[show index] ======= root 'home#index' <<<<<<< HEAD >>>>>>> e1f4d17 (Add login registration pages) ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 69eb97e (Add login registration pages)
  6. 1 <<<<<<< HEAD ======= >>>>>>> 4552227 (Featire specs) resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> 26b462d (Add login registration pages)
  7. <<<<<<< HEAD
  8. =======
  9. >>>>>>> 4552227 (Featire specs)
  10. 1 ======= >>>>>>> 69eb97e (Add login registration pages) resources :books, only: %i[show index]
  11. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 let(:decorator) { described_class.new(author) }
  4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
  5. 1 context 'when decorate' do
  6. 1 it '#full_name' do
  7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  8. end
  9. end
  10. end
<<<<<<< HEAD >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

======= =======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } ======= let(:book_decorator) { described_class.new(book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
  4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  5. <<<<<<< HEAD
  6. 2 =======
  7. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
  8. <<<<<<< HEAD
  9. 1 context 'when decorate' do
  10. 1 it '#full_name' do
  11. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  12. end
  13. end
  14. end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

>>>>>>> fd6db03 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 998f08d (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do ======= RSpec.describe BookDecorator do >>>>>>> fd6db03 (Manifest_cache true) ======= RSpec.describe BookDecorator do >>>>>>> 998f08d (Manifest_cache true)
  3. <<<<<<< HEAD <<<<<<< HEAD
  4. 2 =======
  5. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
  6. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD let(:decorator) { described_class.new(author) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> fd6db03 (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 998f08d (Manifest_cache true)
  7. <<<<<<< HEAD <<<<<<< HEAD
  8. 2 =======
  9. 1 >>>>>>> fd6db03 (Manifest_cache true) =======
  10. 1 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') } ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) ======= let(:authors) do >>>>>>> 998f08d (Manifest_cache true)
  11. <<<<<<< HEAD <<<<<<< HEAD ======= [ >>>>>>> fd6db03 (Manifest_cache true) ======= [ >>>>>>> 998f08d (Manifest_cache true)
  12. <<<<<<< HEAD <<<<<<< HEAD
  13. 1 context 'when decorate' do
  14. 1 it '#full_name' do
  15. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  16. end
  17. end
  18. end

spec/decorators/book_decorator_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
  2. <<<<<<< HEAD <<<<<<< HEAD
  3. ======= ======= >>>>>>> 1a9aba9 (Fix)
  4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD root 'home#index' ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD devise_for :users ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ec6862 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) ======= devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= devise_for :users >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) ======= devise_for :admin_users, ActiveAdmin::Devise.config ======= root 'home#index' >>>>>>> fb10fe4 (Add login registration pages)
  5. <<<<<<< HEAD
  6. <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= =======
  7. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= =======
  8. 1 resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages)
  9. 1 resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> 26b462d (Add login registration pages)
  10. 1 resources :books, only: %i[show index]
  11. end
<<<<<<< HEAD =======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. >>>>>>> fb10fe4 (Add login registration pages) >>>>>>> 591c3b2 (Add login registration pages)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 591c3b2 (Add login registration pages) ======= ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) Rails.application.routes.draw do ======= RSpec.describe AuthorDecorator do >>>>>>> fb10fe4 (Add login registration pages)
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 591c3b2 (Add login registration pages)
  5. 1 =======
  6. 2 >>>>>>> fb10fe4 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 2471c87 (Add login registration pages) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 65459e8 (Add login registration pages) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> aeec696 (Add login registration pages) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> b5affcb (Add login registration pages) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 4f7c979 (Add login registration pages) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 60943cc (Add login registration pages) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 591c3b2 (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) root 'home#index' ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ActiveAdmin.routes(self) ======= resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> 1214e1f (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 08edf50 (Featire specs) ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 7a02bbe (Featire specs) ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 4552227 (Featire specs) ======= root 'home#index' >>>>>>> 26b462d (Add login registration pages) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 7c4ea7f (Fix) ======= devise_for :admin_users, ActiveAdmin::Devise.config ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 8f1bc14 (Fix) ======= let(:decorator) { described_class.new(author) } <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
  7. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
  8. 1 context 'when decorate' do
  9. 1 it '#full_name' do
  10. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  11. end
  12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD resources :books, only: %i[show index]
  13. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
=======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 let(:decorator) { described_class.new(author) }
  4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
  5. 1 context 'when decorate' do
  6. 1 it '#full_name' do
  7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  8. end
  9. end
  10. end
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

======= =======
======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } ======= let(:book_decorator) { described_class.new(book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
  4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  5. <<<<<<< HEAD
  6. 2 =======
  7. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
  8. <<<<<<< HEAD
  9. 1 =======
  10. 2 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) context 'when decorate' do
  11. <<<<<<< HEAD
  12. 1 =======
  13. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) it '#full_name' do
  14. <<<<<<< HEAD
  15. 1 =======
  16. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) expect(decorator.full_name).to eq('Vlad Todorchuk')
  17. end
  18. <<<<<<< HEAD
  19. =======
  20. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) end
  21. end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. <<<<<<< HEAD
  3. 1 RSpec.describe AuthorDecorator do
  4. =======
  5. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 2 let(:decorator) { described_class.new(author) }
  6. <<<<<<< HEAD
  7. =======
  8. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
  9. <<<<<<< HEAD
  10. 2 =======
  11. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
  12. <<<<<<< HEAD
  13. 1 context 'when decorate' do
  14. 1 it '#full_name' do
  15. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  16. end
  17. =======
  18. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) end
  19. <<<<<<< HEAD
  20. <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) end
<<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> aa7b40c (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
  3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
  4. <<<<<<< HEAD <<<<<<< HEAD
  5. =======
  6. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  7. >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
  8. 1 <<<<<<< HEAD <<<<<<< HEAD resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages)
  9. 1 ======= >>>>>>> 4552227 (Featire specs) resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> 26b462d (Add login registration pages)
  10. <<<<<<< HEAD
  11. =======
  12. >>>>>>> 4552227 (Featire specs)
  13. 1 resources :books, only: %i[show index] ======= ======= <<<<<<< HEAD root 'home#index' >>>>>>> 3dc272d (Featire specs)
  14. 1 ======= <<<<<<< HEAD >>>>>>> 27ceb6f (Add login registration pages) ======= <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) resources :books, only: %i[show index]
  15. <<<<<<< HEAD <<<<<<< HEAD
  16. ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD
  17. =======
  18. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  19. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) end
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 let(:decorator) { described_class.new(author) }
  4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') } ======= ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> c033601 (Rebased)
  5. 1 devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
  6. 1 root 'home#index'
  7. 1 resources :orders, only: %i[index] do
  8. 1 get '/add_to_order', to: 'order_books#add_to_order'
  9. 1 delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
  10. 1 put '/order_update_book', to: 'order_books#update_quantity'
  11. end
  12. 1 get '/coupon_check', to: 'coupons#find'
  13. 1 resources :users
  14. 1 resources :books, only: %i[show index] do
  15. 1 resources :reviews, only: :create
  16. end
  17. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
>>>>>>> 066fd0b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

======= =======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } ======= let(:book_decorator) { described_class.new(book) } >>>>>>> 066fd0b (Fix book_spec decrease quantity and price)
  4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  5. <<<<<<< HEAD
  6. 2 =======
  7. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
  8. <<<<<<< HEAD
  9. 1 context 'when decorate' do
  10. 1 it '#full_name' do
  11. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  12. end
  13. end
  14. end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

>>>>>>> fd6db03 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 998f08d (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do ======= RSpec.describe BookDecorator do >>>>>>> fd6db03 (Manifest_cache true) ======= RSpec.describe BookDecorator do >>>>>>> 998f08d (Manifest_cache true)
  3. <<<<<<< HEAD <<<<<<< HEAD
  4. 2 =======
  5. 3 >>>>>>> fd6db03 (Manifest_cache true) =======
  6. 3 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD let(:decorator) { described_class.new(author) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> fd6db03 (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 998f08d (Manifest_cache true)
  7. <<<<<<< HEAD <<<<<<< HEAD
  8. 2 =======
  9. 1 >>>>>>> fd6db03 (Manifest_cache true) =======
  10. 1 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') } ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) ======= let(:authors) do >>>>>>> 998f08d (Manifest_cache true)
  11. <<<<<<< HEAD <<<<<<< HEAD ======= [ >>>>>>> fd6db03 (Manifest_cache true) ======= [ >>>>>>> 998f08d (Manifest_cache true)
  12. <<<<<<< HEAD <<<<<<< HEAD
  13. 1 context 'when decorate' do
  14. 1 it '#full_name' do
  15. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  16. end
  17. end
  18. end
======= ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
  2. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) root 'home#index' ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= root 'home#index' ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD devise_for :users ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) root 'home#index' ======= ======= >>>>>>> 22ee41c (Add login registration pages) ======= root 'home#index' ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD devise_for :users ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 03c0867 (Add login registration pages) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 904663c (Featire specs) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 551f3c1 (Add login registration pages) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8be9029 (Add login registration pages) ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> e5752db (Featire specs) ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ccec311 (Add login registration pages) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 7d58507 (Add login registration pages) ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> e50f73e (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 852864e (Add login registration pages) ======= ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> 551f3c1 (Add login registration pages) ======= ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> ccec311 (Add login registration pages) ======= ======= ======= root 'home#index' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= devise_for :users >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 848bfa2 (Featire specs) >>>>>>> 9ec6862 (Add login registration pages) ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) <<<<<<< HEAD >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 697ad44 (Add login registration pages) ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= devise_for :admin_users, ActiveAdmin::Devise.config ======= devise_for :users >>>>>>> 1214e1f (Add login registration pages) >>>>>>> f182ac7 (Add login registration pages) <<<<<<< HEAD >>>>>>> 0fc3bf0 (Add login registration pages) ======= ======= ======= root 'home#index' >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= ======= devise_for :users >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57da3ff (Add login registration pages) <<<<<<< HEAD >>>>>>> af9487a (Add login registration pages) ======= ======= ======= root 'home#index' >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= devise_for :users >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> a624084 (Add login registration pages) <<<<<<< HEAD >>>>>>> 140c987 (Add login registration pages) ======= ======= ======= root 'home#index' >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= devise_for :users >>>>>>> 26b462d (Add login registration pages) >>>>>>> 6a9fede (Add login registration pages) >>>>>>> 0c3a150 (Add login registration pages)
  4. =======
  5. >>>>>>> 7c4ea7f (Fix)
  6. 1 ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) Rails.application.routes.draw do
  7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  8. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD root 'home#index' ======= ActiveAdmin.routes(self) >>>>>>> aca90e3 (Rebased) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> cb74525 (Add login registration pages) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 852864e (Add login registration pages) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 551f3c1 (Add login registration pages) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> ccec311 (Add login registration pages) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 8c3e531 (Add login registration pages) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 039806b (Add login registration pages) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 0fc3bf0 (Add login registration pages) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> af9487a (Add login registration pages) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 140c987 (Add login registration pages) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0c3a150 (Add login registration pages) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) root 'home#index' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ActiveAdmin.routes(self) ======= ======= >>>>>>> e50f73e (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) root 'home#index' >>>>>>> df37394 (Featire specs) ======= ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ActiveAdmin.routes(self) ======= resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> 1214e1f (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 08edf50 (Featire specs) ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 7a02bbe (Featire specs) ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 4552227 (Featire specs) ======= root 'home#index' >>>>>>> 26b462d (Add login registration pages) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) root 'home#index' >>>>>>> 715fac2 (Featire specs) ======= ======= ActiveAdmin.routes(self) >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 6a9fede (Add login registration pages) ActiveAdmin.routes(self) ======= resources :books, only: %i[show index] ======= root 'home#index' >>>>>>> 1214e1f (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 08edf50 (Featire specs) ======= root 'home#index' >>>>>>> 730a8ca (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 7a02bbe (Featire specs) ======= root 'home#index' >>>>>>> e1f4d17 (Add login registration pages) ======= resources :books, only: %i[show index] >>>>>>> 4552227 (Featire specs) ======= root 'home#index' >>>>>>> 26b462d (Add login registration pages) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 7c4ea7f (Fix) ======= devise_for :admin_users, ActiveAdmin::Devise.config ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= devise_for :admin_users, ActiveAdmin::Devise.config >>>>>>> 8f1bc14 (Fix)
  9. 1 authenticate :admin_user do
  10. 1 mount Sidekiq::Web => '/sidekiq'
  11. end
  12. 1 ActiveAdmin.routes(self)
  13. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD resources :books, only: %i[show index]
  14. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
=======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 let(:decorator) { described_class.new(author) }
  4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
  5. 1 context 'when decorate' do
  6. 1 it '#full_name' do
  7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  8. end
  9. end
  10. end
>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

======= =======

spec/decorators/author_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 let(:decorator) { described_class.new(author) }
  4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
  5. 1 context 'when decorate' do
  6. 1 it '#full_name' do
  7. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  8. end
  9. end
  10. ======= >>>>>>> 7a02bbe (Featire specs) end
<<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> aa7b40c (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
  3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
  4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD authenticate :admin_user do
  6. 1 mount Sidekiq::Web => '/sidekiq'
  7. end
  8. 1 ActiveAdmin.routes(self)
  9. 1 <<<<<<< HEAD ======= ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) resources :books, only: %i[show index]
  10. <<<<<<< HEAD <<<<<<< HEAD
  11. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> 03c0867 (Add login registration pages) <<<<<<< HEAD
  12. ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD
  13. =======
  14. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  15. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> 715fac2 (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 let(:decorator) { described_class.new(author) }
  4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') } ======= ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 0832698 (Manifest_cache true) devise_for :users ======= let(:categories) do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) ======= ======= let(:categories) do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) ======= devise_for :users >>>>>>> 8f1bc14 (Fix) ======= end >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price)
  5. ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) end
>>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 1214e1f (Add login registration pages) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
  4. 3 <<<<<<< HEAD let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  5. 1 ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) authenticate :admin_user do
  6. 1 mount Sidekiq::Web => '/sidekiq'
  7. end
  8. 1 ActiveAdmin.routes(self)
  9. 1 devise_for :users
  10. 1 devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
  11. 1 root 'home#index'
  12. 1 resource :checkout, only: %i[new create edit show update]
  13. 1 resources :orders, only: %i[index show update] do
  14. 1 get '/add_to_order', to: 'order_books#add_to_order'
  15. 1 delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
  16. 1 put '/order_update_book', to: 'order_books#update_quantity'
  17. end
  18. 1 get '/coupon_check', to: 'coupons#find'
  19. 1 resources :users
  20. 1 resources :books, only: %i[show index] do
  21. 1 resources :reviews, only: :create
  22. end
  23. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
<<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

======= =======

spec/decorators/author_decorator_spec.rb

======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix)
>>>>>>> c033601 (Rebased)

spec/decorators/author_decorator_spec.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1a9aba9 (Fix) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> ed97c39 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 587ce47 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) ======= <<<<<<< HEAD ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

spec/decorators/author_decorator_spec.rb

>>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= <<<<<<< HEAD ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true)

spec/decorators/author_decorator_spec.rb

======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

<<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true)

spec/decorators/book_decorator_spec.rb

<<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 12 relevant lines. 12 lines covered and >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= 13 relevant lines. 13 lines covered and <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> 2c640cf (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) 5 relevant lines. 5 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> 845dac1 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) RSpec.describe AuthorDecorator, type: :decorator do ======= require 'rails_helper' >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) ======= require 'rails_helper' >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 7c4ea7f (Fix)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  3. ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
  4. 2 >>>>>>> 24b58e6 (Manifest_cache true)
  5. <<<<<<< HEAD
  6. 1 <<<<<<< HEAD RSpec.describe AuthorDecorator do ======= <<<<<<< HEAD RSpec.describe BookDecorator do ======= let(:author) { create(:author) } >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix)
  7. <<<<<<< HEAD
  8. 2 let(:decorator) { described_class.new(author) }
  9. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
  10. 1 context 'when decorate' do
  11. 1 it '#full_name' do
  12. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  13. end
  14. end
  15. ======= >>>>>>> 7a02bbe (Featire specs) end
<<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> aa7b40c (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
  3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
  4. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  5. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) resources :books, only: %i[show index]
  6. <<<<<<< HEAD <<<<<<< HEAD
  7. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 730a8ca (Add login registration pages) ======= >>>>>>> e1f4d17 (Add login registration pages) ======= ======= >>>>>>> e50f73e (Add login registration pages) <<<<<<< HEAD
  8. ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD
  9. =======
  10. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  11. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> df37394 (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 let(:decorator) { described_class.new(author) }
  4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') } ======= ======= >>>>>>> bf554f4 (Rebased) devise_for :users >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> 0832698 (Manifest_cache true) devise_for :users ======= let(:categories) do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3b839af (Manifest_cache true) ======= ======= let(:categories) do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) ======= devise_for :users >>>>>>> 8f1bc14 (Fix)
  5. 1 devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
  6. 1 root 'home#index'
  7. 1 resource :checkout, only: %i[new create]
  8. 1 resources :orders, only: %i[index edit update show] do
  9. 1 get '/add_to_order', to: 'order_books#add_to_order'
  10. 1 delete '/delete_from_cart/:book_id', to: 'order_books#delete_product'
  11. 1 put '/order_update_book', to: 'order_books#update_quantity'
  12. end
  13. 1 get '/coupon_check', to: 'coupons#find'
  14. 1 resources :users
  15. 1 resources :books, only: %i[show index] do
  16. 1 resources :reviews, only: :create
  17. end
  18. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
<<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

======= =======

spec/decorators/author_decorator_spec.rb

======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
>>>>>>> c033601 (Rebased)

spec/decorators/author_decorator_spec.rb

<<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 1d59aaa (Fix) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= =======

spec/decorators/book_decorator_spec.rb

>>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix)

spec/decorators/author_decorator_spec.rb

>>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true)

spec/decorators/author_decorator_spec.rb

======= >>>>>>> b15044a (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

<<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 12 relevant lines. 12 lines covered and >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= 13 relevant lines. 13 lines covered and <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> b15044a (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> 2c640cf (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) 5 relevant lines. 5 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> 845dac1 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) RSpec.describe AuthorDecorator, type: :decorator do ======= require 'rails_helper' >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) ======= require 'rails_helper' >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 7c4ea7f (Fix)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  3. ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
  4. 2 >>>>>>> 24b58e6 (Manifest_cache true)
  5. <<<<<<< HEAD
  6. 1 RSpec.describe AuthorDecorator do
  7. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) subject(:book_decorator) { described_class.new(book) } ======= <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> bd8bda4 (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> aa7b40c (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 183b6c5 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
  8. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
  9. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') }
  10. 1 context 'when decorate' do
  11. 1 it '#full_name' do
  12. 1 expect(decorator.full_name).to eq('Vlad Todorchuk')
  13. end
  14. end
  15. ======= >>>>>>> 7a02bbe (Featire specs) end
<<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/book_decorator_spec.rb

>>>>>>> bd8bda4 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> aa7b40c (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 7 relevant lines. 7 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator do
  3. 2 <<<<<<< HEAD let(:decorator) { described_class.new(author) } >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> c54769d (Fix book_spec decrease quantity and price)
  4. ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
  5. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  6. <<<<<<< HEAD
  7. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> b6a32ab (Add login registration pages) ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) resources :books, only: %i[show index]
  8. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b6a32ab (Add login registration pages)
  9. ======= ======= >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs)
  10. =======
  11. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= =======
  12. >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) >>>>>>> b6a32ab (Add login registration pages) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> f764a87 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)

spec/decorators/author_decorator_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AuthorDecorator do
  3. 2 let(:decorator) { described_class.new(author) }
  4. 2 let(:author) { FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk') } ======= ======= >>>>>>> bf554f4 (Rebased) devise_for :users <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased)
  5. 1 devise_for :users, as: 'omniauth', controller: { omniauth_callbacks: 'callbacks' }
  6. 1 root 'home#index'
  7. 1 resources :users
  8. 1 resources :books, only: %i[show index] do
  9. 1 resources :reviews, only: :create
  10. end
  11. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> d52ad35 (Rebased) ======= >>>>>>> b28889f (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
<<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true)
>>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased)

spec/decorators/author_decorator_spec.rb

=======

spec/decorators/book_decorator_spec.rb

>>>>>>> 02a399d (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 183b6c5 (Manifest_cache true) =======

spec/decorators/book_decorator_spec.rb

>>>>>>> fd6db03 (Manifest_cache true) =======

spec/decorators/author_decorator_spec.rb

>>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true)
>>>>>>> c033601 (Rebased)

spec/decorators/author_decorator_spec.rb

<<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= =======

spec/decorators/book_decorator_spec.rb

>>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true)

100.0% lines covered

<<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) 12 relevant lines. 12 lines covered and ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= ======= >>>>>>> b15044a (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> 2c640cf (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> bd8bda4 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> aa7b40c (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) 5 relevant lines. 5 lines covered and >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) 5 relevant lines. 5 lines covered and ======= 5 relevant lines. 5 lines covered and >>>>>>> 845dac1 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= 12 relevant lines. 12 lines covered and >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d1bae53 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> eaef86a (Fix) ======= 5 relevant lines. 5 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AuthorDecorator, type: :decorator do ======= require 'rails_helper' >>>>>>> 02a399d (Manifest_cache true) ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) ======= require 'rails_helper' >>>>>>> fd6db03 (Manifest_cache true) ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> a5d032d (Fix)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  3. 2 subject(:decorated_object) { described_class.new(author) }
  4. ======= ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD
  5. >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true)
  6. 2 >>>>>>> 24b58e6 (Manifest_cache true)
  7. 2 let(:author) { create(:author) } ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
  8. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  9. ======= ======= <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix)
  10. 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) subject(:book_decorator) { described_class.new(book) } ======= <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> bd8bda4 (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> aa7b40c (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 183b6c5 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  11. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  12. ======= <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
  13. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  14. <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  15. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  16. >>>>>>> bd8bda4 (Manifest_cache true) =======
  17. >>>>>>> aa7b40c (Manifest_cache true) =======
  18. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) =======
  19. >>>>>>> 02a399d (Manifest_cache true) =======
  20. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= =======
  21. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e654b (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> cae047f (Manifest_cache true) ======= =======
  22. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> a9e654b (Manifest_cache true) ======= =======
  23. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= =======
  24. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= =======
  25. >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix)
  26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  27. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  28. ======= <<<<<<< HEAD
  29. =======
  30. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  31. >>>>>>> bd8bda4 (Manifest_cache true) =======
  32. >>>>>>> aa7b40c (Manifest_cache true) =======
  33. >>>>>>> 183b6c5 (Manifest_cache true) =======
  34. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) 1 describe '#full_name' do
  35. 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
  36. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  37. ======= <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  38. ======= <<<<<<< HEAD
  39. =======
  40. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  41. >>>>>>> bd8bda4 (Manifest_cache true) =======
  42. >>>>>>> aa7b40c (Manifest_cache true) =======
  43. >>>>>>> 183b6c5 (Manifest_cache true) =======
  44. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) [
  45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  46. >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  47. >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD
  48. >>>>>>> bd8bda4 (Manifest_cache true) =======
  49. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  50. >>>>>>> bd8bda4 (Manifest_cache true) =======
  51. >>>>>>> aa7b40c (Manifest_cache true) =======
  52. >>>>>>> 183b6c5 (Manifest_cache true) =======
  53. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> b9cc4e9 (Manifest_cache true)
  54. >>>>>>> c033601 (Rebased) =======
  55. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  56. >>>>>>> bd8bda4 (Manifest_cache true) =======
  57. >>>>>>> aa7b40c (Manifest_cache true) =======
  58. >>>>>>> 183b6c5 (Manifest_cache true) =======
  59. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) =======
  60. >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) 2 =======
  61. 2 >>>>>>> a5d032d (Fix) subject(:decorated_object) { described_class.new(author) }
  62. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  63. >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  64. >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) =======
  65. >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD
  66. >>>>>>> 183b6c5 (Manifest_cache true) =======
  67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> f764a87 (Fix book_spec decrease quantity and price) =======
  68. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  69. >>>>>>> bd8bda4 (Manifest_cache true) =======
  70. >>>>>>> aa7b40c (Manifest_cache true) =======
  71. >>>>>>> 183b6c5 (Manifest_cache true) =======
  72. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  73. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= =======
  74. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) =======
  75. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  76. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= =======
  77. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true)
  78. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  79. ======= <<<<<<< HEAD
  80. =======
  81. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  82. >>>>>>> bd8bda4 (Manifest_cache true) =======
  83. >>>>>>> aa7b40c (Manifest_cache true) =======
  84. >>>>>>> 183b6c5 (Manifest_cache true) =======
  85. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
  86. 2 =======
  87. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= =======
  88. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  89. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  90. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  91. 2 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ] ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) let(:author) { create(:author) } ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  92. <<<<<<< HEAD <<<<<<< HEAD
  93. 3 <<<<<<< HEAD <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true)
  94. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  95. ======= <<<<<<< HEAD
  96. =======
  97. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  98. >>>>>>> bd8bda4 (Manifest_cache true) =======
  99. >>>>>>> aa7b40c (Manifest_cache true) =======
  100. >>>>>>> 183b6c5 (Manifest_cache true) =======
  101. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  102. ======= ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price)
  103. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  104. <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  105. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  106. >>>>>>> 8f1bc14 (Fix)
  107. 1 describe '#full_name' do
  108. 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
  109. <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= end
  110. end

spec/decorators/book_decorator_spec.rb

100.0% lines covered

15 relevant lines. 15 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe BookDecorator do
  2. 4 subject(:decorated_object) { described_class.new(book) } ======= root 'home#index' >>>>>>> cde4834 (Manifest_cache true)
  3. 1 <<<<<<< HEAD let(:book) do ======= resources :books, only: %i[show index] >>>>>>> cde4834 (Manifest_cache true)
  4. <<<<<<< HEAD
  5. =======
  6. end

spec/decorators/book_decorator_spec.rb

100.0% lines covered

12 relevant lines. 12 lines covered and ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= 12 relevant lines. 12 lines covered and >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= 5 relevant lines. 5 lines covered and >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) RSpec.describe AuthorDecorator, type: :decorator do ======= require 'rails_helper' >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) ======= require 'rails_helper' >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= ======= require 'rails_helper' >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= RSpec.describe AuthorDecorator, type: :decorator do >>>>>>> 7c4ea7f (Fix)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  3. ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
  4. 2 >>>>>>> 24b58e6 (Manifest_cache true)
  5. <<<<<<< HEAD
  6. 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe BookDecorator do ======= let(:author) { create(:author) } >>>>>>> 8f1bc14 (Fix) ======= let(:author) { create(:author) } >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  7. <<<<<<< HEAD <<<<<<< HEAD
  8. >>>>>>> cde4834 (Manifest_cache true) 3 <<<<<<< HEAD <<<<<<< HEAD create(:book, price_cents: 123, authors: authors, categories: categories, ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> cde4834 (Manifest_cache true) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) subject(:book_decorator) { described_class.new(book) } ======= <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> bd8bda4 (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> aa7b40c (Manifest_cache true) ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 183b6c5 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  9. <<<<<<< HEAD <<<<<<< HEAD
  10. ======= ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  11. >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD categories_count: 0, ======= >>>>>>> cde4834 (Manifest_cache true)
  12. <<<<<<< HEAD
  13. authors_count: 0)
  14. end
  15. =======
  16. >>>>>>> cde4834 (Manifest_cache true) 1 let(:authors) do
  17. <<<<<<< HEAD
  18. =======
  19. >>>>>>> cde4834 (Manifest_cache true) [
  20. <<<<<<< HEAD
  21. 3 =======
  22. 2 >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name), ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> cde4834 (Manifest_cache true)
  23. <<<<<<< HEAD
  24. =======
  25. >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> cde4834 (Manifest_cache true)
  26. <<<<<<< HEAD <<<<<<< HEAD
  27. <<<<<<< HEAD =======
  28. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
  29. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= =======
  30. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= =======
  31. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= =======
  32. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= =======
  33. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD ======= >>>>>>> 1ac6be1 (Fix) =======
  34. >>>>>>> 8f1bc14 (Fix) =======
  35. >>>>>>> cde4834 (Manifest_cache true) ]
  36. <<<<<<< HEAD
  37. =======
  38. >>>>>>> cde4834 (Manifest_cache true) end
  39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  40. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix)
  41. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  42. ======= <<<<<<< HEAD
  43. =======
  44. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  45. >>>>>>> bd8bda4 (Manifest_cache true) =======
  46. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  47. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD
  48. ======= ======= >>>>>>> cae047f (Manifest_cache true)
  49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  50. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  51. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  52. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  53. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  54. >>>>>>> 7c4ea7f (Fix) =======
  55. >>>>>>> cde4834 (Manifest_cache true) 1 let(:categories) do
  56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD
  57. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  58. ======= <<<<<<< HEAD
  59. =======
  60. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  61. >>>>>>> bd8bda4 (Manifest_cache true) =======
  62. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  63. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
  64. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  65. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  66. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  67. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  68. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  69. >>>>>>> 7c4ea7f (Fix) =======
  70. >>>>>>> cde4834 (Manifest_cache true) [
  71. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD
  72. 3 >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  73. ======= <<<<<<< HEAD
  74. =======
  75. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  76. >>>>>>> bd8bda4 (Manifest_cache true) =======
  77. >>>>>>> aa7b40c (Manifest_cache true) =======
  78. >>>>>>> 183b6c5 (Manifest_cache true) =======
  79. >>>>>>> 022e63e (Manifest_cache true) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
  80. >>>>>>> c033601 (Rebased) 2 =======
  81. 2 >>>>>>> a5d032d (Fix) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true)
  82. >>>>>>> c033601 (Rebased) 2 =======
  83. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= <<<<<<< HEAD
  84. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= =======
  85. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= =======
  86. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= =======
  87. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= =======
  88. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= =======
  89. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= =======
  90. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= =======
  91. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= =======
  92. 3 >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) =======
  93. 2 >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD subject(:decorated_object) { described_class.new(author) } ======= ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) <<<<<<< HEAD let(:author) { create(:author) } ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) create(:category, name: FFaker::Book.genre), >>>>>>> 2722d07 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) RSpec.describe BookDecorator do ======= let(:author) { create(:author) } >>>>>>> a5d032d (Fix) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> cde4834 (Manifest_cache true)
  94. <<<<<<< HEAD <<<<<<< HEAD
  95. 3 =======
  96. >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> cde4834 (Manifest_cache true)
  97. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
  98. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  99. ======= <<<<<<< HEAD
  100. =======
  101. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  102. >>>>>>> bd8bda4 (Manifest_cache true) =======
  103. >>>>>>> aa7b40c (Manifest_cache true) =======
  104. >>>>>>> 183b6c5 (Manifest_cache true) =======
  105. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  106. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD =======
  107. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) =======
  108. >>>>>>> a5d032d (Fix) ======= =======
  109. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) ======= ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  110. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  111. <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) =======
  112. >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= =======
  113. >>>>>>> bd8bda4 (Manifest_cache true) =======
  114. >>>>>>> aa7b40c (Manifest_cache true) =======
  115. >>>>>>> 183b6c5 (Manifest_cache true) =======
  116. >>>>>>> fd6db03 (Manifest_cache true) =======
  117. >>>>>>> 998f08d (Manifest_cache true) =======
  118. >>>>>>> 7c4ea7f (Fix) create(:category, name: FFaker::Book.genre) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
  119. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
  120. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  121. ======= <<<<<<< HEAD
  122. =======
  123. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
  124. >>>>>>> bd8bda4 (Manifest_cache true) =======
  125. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  126. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
  127. ======= <<<<<<< HEAD
  128. >>>>>>> cae047f (Manifest_cache true) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  129. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  130. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  131. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  132. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  133. >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
  134. 2 =======
  135. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= =======
  136. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  137. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  138. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  139. 2 >>>>>>> 7c4ea7f (Fix) =======
  140. >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ] ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) let(:author) { create(:author) } ======= ] >>>>>>> cde4834 (Manifest_cache true)
  141. <<<<<<< HEAD <<<<<<< HEAD
  142. 3 <<<<<<< HEAD <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true)
  143. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  144. ======= <<<<<<< HEAD
  145. =======
  146. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  147. >>>>>>> bd8bda4 (Manifest_cache true) =======
  148. >>>>>>> aa7b40c (Manifest_cache true) =======
  149. >>>>>>> 183b6c5 (Manifest_cache true) =======
  150. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  151. ======= ======= >>>>>>> b15044a (Manifest_cache true)
  152. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  153. >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  154. >>>>>>> 7c4ea7f (Fix) ======= ======= =======
  155. >>>>>>> bd8bda4 (Manifest_cache true) =======
  156. >>>>>>> aa7b40c (Manifest_cache true) =======
  157. >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  158. >>>>>>> 02a399d (Manifest_cache true) =======
  159. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= =======
  160. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= =======
  161. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= =======
  162. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= =======
  163. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix)
  164. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  165. =======
  166. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) =======
  167. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  168. >>>>>>> bd8bda4 (Manifest_cache true) =======
  169. >>>>>>> aa7b40c (Manifest_cache true) =======
  170. >>>>>>> 183b6c5 (Manifest_cache true) =======
  171. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) 1 >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) describe '#full_name' do ======= let(:authors) do ======= let(:author) { create(:author) } ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> a455e8a (Fix book_spec decrease quantity and price) >>>>>>> 7718476 (Fix book_spec decrease quantity and price)
  172. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
  173. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  174. ======= <<<<<<< HEAD
  175. =======
  176. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  177. >>>>>>> bd8bda4 (Manifest_cache true) =======
  178. >>>>>>> aa7b40c (Manifest_cache true) =======
  179. >>>>>>> 183b6c5 (Manifest_cache true) =======
  180. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) [
  181. <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  182. ======= <<<<<<< HEAD
  183. =======
  184. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  185. >>>>>>> bd8bda4 (Manifest_cache true) =======
  186. >>>>>>> aa7b40c (Manifest_cache true) =======
  187. >>>>>>> 183b6c5 (Manifest_cache true) =======
  188. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true)
  189. >>>>>>> c033601 (Rebased) 2 =======
  190. 2 >>>>>>> a5d032d (Fix) subject(:decorated_object) { described_class.new(author) }
  191. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  192. ======= <<<<<<< HEAD
  193. =======
  194. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  195. >>>>>>> bd8bda4 (Manifest_cache true) =======
  196. >>>>>>> aa7b40c (Manifest_cache true) =======
  197. >>>>>>> 183b6c5 (Manifest_cache true) =======
  198. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  199. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= =======
  200. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) =======
  201. >>>>>>> a5d032d (Fix) ======= =======
  202. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true)
  203. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  204. ======= <<<<<<< HEAD
  205. =======
  206. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  207. >>>>>>> bd8bda4 (Manifest_cache true) =======
  208. >>>>>>> aa7b40c (Manifest_cache true) =======
  209. >>>>>>> 183b6c5 (Manifest_cache true) =======
  210. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
  211. 2 =======
  212. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= =======
  213. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  214. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  215. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  216. 2 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ] ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 7c4ea7f (Fix) let(:author) { create(:author) } ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  217. <<<<<<< HEAD <<<<<<< HEAD
  218. 3 <<<<<<< HEAD <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true)
  219. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  220. ======= <<<<<<< HEAD
  221. =======
  222. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  223. >>>>>>> bd8bda4 (Manifest_cache true) =======
  224. >>>>>>> aa7b40c (Manifest_cache true) =======
  225. >>>>>>> 183b6c5 (Manifest_cache true) =======
  226. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  227. ======= ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price)
  228. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  229. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  230. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  231. >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======
  232. >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  233. 1 describe '#full_name' do
  234. 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
  235. <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= end
  236. end

spec/decorators/book_decorator_spec.rb

100.0% lines covered

15 relevant lines. 15 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe BookDecorator do
  2. 4 subject(:decorated_object) { described_class.new(book) }
  3. 1 let(:book) do
  4. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
  5. categories_count: 0,
  6. authors_count: 0)
  7. end
  8. 1 let(:authors) do
  9. [
  10. 3 create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
  11. create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
  12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  13. <<<<<<< HEAD =======
  14. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= =======
  15. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
  16. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  17. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  18. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  19. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) =======
  20. >>>>>>> 8f1bc14 (Fix) ]
  21. ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price)
  22. =======
  23. >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) ]
  24. end
  25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  26. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  27. ======= <<<<<<< HEAD
  28. =======
  29. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  30. >>>>>>> bd8bda4 (Manifest_cache true) =======
  31. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  32. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
  33. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  34. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  35. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  36. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  37. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  38. >>>>>>> 7c4ea7f (Fix) 1 let(:categories) do
  39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD
  40. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  41. ======= <<<<<<< HEAD
  42. =======
  43. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  44. >>>>>>> bd8bda4 (Manifest_cache true) =======
  45. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  46. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
  47. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  48. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  49. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  50. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  51. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  52. >>>>>>> 7c4ea7f (Fix) [
  53. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD
  54. 3 >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  55. ======= <<<<<<< HEAD
  56. =======
  57. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  58. >>>>>>> bd8bda4 (Manifest_cache true) =======
  59. >>>>>>> aa7b40c (Manifest_cache true) =======
  60. >>>>>>> 183b6c5 (Manifest_cache true) =======
  61. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true)
  62. >>>>>>> c033601 (Rebased) 2 =======
  63. 1 >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD
  64. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
  65. 1 >>>>>>> fd6db03 (Manifest_cache true) =======
  66. 2 >>>>>>> a5d032d (Fix) =======
  67. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
  68. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  69. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  70. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  71. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  72. 3 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:author) { create(:author) } ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) create(:category, name: FFaker::Book.genre), >>>>>>> 2722d07 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) RSpec.describe BookDecorator do ======= let(:author) { create(:author) } >>>>>>> a5d032d (Fix)
  73. <<<<<<< HEAD
  74. 3 <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 7c4ea7f (Fix)
  75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
  76. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  77. ======= <<<<<<< HEAD
  78. =======
  79. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  80. >>>>>>> bd8bda4 (Manifest_cache true) =======
  81. >>>>>>> aa7b40c (Manifest_cache true) =======
  82. >>>>>>> 183b6c5 (Manifest_cache true) =======
  83. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  84. >>>>>>> c033601 (Rebased) =======
  85. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  86. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  87. >>>>>>> a5d032d (Fix) ======= =======
  88. >>>>>>> bd8bda4 (Manifest_cache true) =======
  89. >>>>>>> aa7b40c (Manifest_cache true) =======
  90. >>>>>>> 183b6c5 (Manifest_cache true) =======
  91. >>>>>>> fd6db03 (Manifest_cache true) =======
  92. >>>>>>> 998f08d (Manifest_cache true) =======
  93. >>>>>>> 7c4ea7f (Fix) create(:category, name: FFaker::Book.genre) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
  94. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
  95. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  96. ======= <<<<<<< HEAD
  97. =======
  98. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  99. >>>>>>> bd8bda4 (Manifest_cache true) =======
  100. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  101. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
  102. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  103. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  104. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  105. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  106. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  107. >>>>>>> 7c4ea7f (Fix) =======
  108. =======
  109. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 1 >>>>>>> c033601 (Rebased) =======
  110. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) describe '#full_name' do
  111. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
  112. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  113. ======= <<<<<<< HEAD
  114. =======
  115. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 027f794 (Manifest_cache true) ======= =======
  116. >>>>>>> bd8bda4 (Manifest_cache true) =======
  117. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) =======
  118. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d9b13 (Manifest_cache true)
  119. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  120. =======
  121. [
  122. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  123. >>>>>>> a5d032d (Fix) =======
  124. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  125. >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) 2 it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") }
  126. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  127. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) =======
  128. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= =======
  129. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> d1bae53 (Manifest_cache true) ======= =======
  130. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= =======
  131. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= =======
  132. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= =======
  133. >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) =======
  134. >>>>>>> cde4834 (Manifest_cache true) =======
  135. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  136. >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) =======
  137. >>>>>>> c033601 (Rebased) =======
  138. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= =======
  139. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= =======
  140. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= =======
  141. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= =======
  142. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) end
  143. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true)
  144. ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e2bfd89 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d1bae53 (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d9b13 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7f7abc (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) ======= ======= >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true)
  145. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  146. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
  147. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) =======
  148. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
  149. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  150. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  151. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  152. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  153. >>>>>>> 7c4ea7f (Fix) =======
  154. >>>>>>> cde4834 (Manifest_cache true)
  155. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  156. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  157. =======
  158. >>>>>>> 02a399d (Manifest_cache true) =======
  159. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
  160. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  161. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  162. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  163. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  164. >>>>>>> 7c4ea7f (Fix) =======
  165. >>>>>>> cde4834 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD describe '#categories_names' do >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) it '#authors_names' do ======= <<<<<<< HEAD context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= it '#authors_names' do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= describe '#categories_names' do >>>>>>> 7c4ea7f (Fix) ======= it '#authors_names' do >>>>>>> cde4834 (Manifest_cache true)
  166. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  167. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  168. 2 =======
  169. 1 >>>>>>> 02a399d (Manifest_cache true) =======
  170. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
  171. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  172. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  173. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  174. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  175. 2 >>>>>>> 7c4ea7f (Fix) =======
  176. 1 >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= <<<<<<< HEAD it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 7c4ea7f (Fix) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> cde4834 (Manifest_cache true)
  177. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  178. ======= <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
  179. 1 =======
  180. >>>>>>> fd6db03 (Manifest_cache true) =======
  181. >>>>>>> 998f08d (Manifest_cache true) =======
  182. >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> 998f08d (Manifest_cache true) ======= end >>>>>>> cde4834 (Manifest_cache true)
  183. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
  184. ======= >>>>>>> cde4834 (Manifest_cache true)
  185. <<<<<<< HEAD
  186. 1 it '#categories_names' do
  187. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  188. end
  189. =======
  190. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  191. >>>>>>> bd8bda4 (Manifest_cache true) =======
  192. >>>>>>> aa7b40c (Manifest_cache true) =======
  193. >>>>>>> 183b6c5 (Manifest_cache true) =======
  194. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
  195. <<<<<<< HEAD ======= <<<<<<< HEAD
  196. ======= >>>>>>> 7375d4b (Manifest_cache true)
  197. end
  198. 1 it '#categories_names' do
  199. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  200. end
  201. end
  202. <<<<<<< HEAD
  203. <<<<<<< HEAD ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
  204. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
  205. <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= =======
  206. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  207. >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
  208. ]
  209. end
  210. 1 let(:categories) do
  211. [
  212. 2 FactoryBot.create(:category, name: 'Poetry'),
  213. FactoryBot.create(:category, name: 'Novel')
  214. ]
  215. end
  216. ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
  217. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) =======
  218. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
  219. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  220. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  221. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  222. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  223. >>>>>>> 7c4ea7f (Fix)
  224. <<<<<<< HEAD <<<<<<< HEAD
  225. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  226. =======
  227. >>>>>>> 02a399d (Manifest_cache true) =======
  228. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
  229. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  230. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  231. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  232. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  233. >>>>>>> 7c4ea7f (Fix) 1 <<<<<<< HEAD context 'when decorate' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD describe '#categories_names' do >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) it '#authors_names' do ======= <<<<<<< HEAD context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= it '#authors_names' do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= describe '#categories_names' do >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix)
  234. <<<<<<< HEAD <<<<<<< HEAD
  235. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  236. 2 =======
  237. 1 >>>>>>> 02a399d (Manifest_cache true) =======
  238. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
  239. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  240. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  241. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  242. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  243. 2 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD it '#authors_names' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= <<<<<<< HEAD it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix)
  244. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  245. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true)
  246. 1 =======
  247. >>>>>>> fd6db03 (Manifest_cache true) =======
  248. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> 998f08d (Manifest_cache true)
  249. <<<<<<< HEAD <<<<<<< HEAD end
  250. 1 it '#categories_names' do
  251. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  252. end
  253. <<<<<<< HEAD ======= =======
  254. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  255. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= =======
  256. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= =======
  257. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) =======
  258. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
  259. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> 7375d4b (Manifest_cache true)
  260. end
  261. 1 it '#categories_names' do
  262. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  263. end
  264. end
  265. <<<<<<< HEAD
  266. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
  267. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
  268. <<<<<<< HEAD >>>>>>> c033601 (Rebased) ======= =======
  269. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  270. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> eaef86a (Fix) <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
  271. ]
  272. end
  273. 1 let(:categories) do
  274. [
  275. 2 FactoryBot.create(:category, name: 'Poetry'),
  276. FactoryBot.create(:category, name: 'Novel')
  277. ]
  278. end
  279. 1 context 'when decorate' do
  280. 1 it '#authors_names' do
  281. 1 expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
  282. end
  283. 1 it '#categories_names' do
  284. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  285. end
  286. end
  287. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true)
<<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) =======
>>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 0c9131d (Manifest_cache true)
>>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix)

spec/decorators/book_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 75be480 (Manifest_cache true) ======= 15 relevant lines. 15 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= 15 relevant lines. 15 lines covered and >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) 0 lines missed.
    
  1. 1 RSpec.describe BookDecorator do
  2. 4 subject(:decorated_object) { described_class.new(book) }
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs)
  4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 75be480 (Manifest_cache true) let(:book) do ======= resources :books, only: %i[show index] >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe BookDecorator do ======= resources :books, only: %i[show index] >>>>>>> 752f0c0 (Featire specs) ======= resources :books, only: %i[show index] >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) do >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= ======= RSpec.describe BookDecorator do ======= let(:book) do >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 75be480 (Manifest_cache true) ======= RSpec.describe BookDecorator do ======= resources :books, only: %i[show index] >>>>>>> 752f0c0 (Featire specs) ======= resources :books, only: %i[show index] >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) do >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= ======= RSpec.describe BookDecorator do
  5. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
  6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  7. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true)
  8. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  9. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
  10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  11. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
  12. <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs)
  13. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
  14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 75be480 (Manifest_cache true) =======
  15. >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75be480 (Manifest_cache true) ======= =======
  16. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= =======
  17. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 75be480 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD categories_count: 0, ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= categories_count: 0, >>>>>>> a5d032d (Fix) ======= ======= categories_count: 0, ======= ======= ======= categories_count: 0, >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 75be480 (Manifest_cache true) categories_count: 0, ======= <<<<<<< HEAD ======= ======= categories_count: 0, >>>>>>> a5d032d (Fix) ======= ======= categories_count: 0, ======= =======
  18. <<<<<<< HEAD
  19. =======
  20. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true)
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  22. =======
  23. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true)
  24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  25. =======
  26. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true)
  27. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  28. =======
  29. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true) ======= let(:authors) do >>>>>>> aa7b40c (Manifest_cache true) ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true)
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 75be480 (Manifest_cache true)
  31. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) authors_count: 0) ======= [ >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= [ >>>>>>> bd8bda4 (Manifest_cache true) ======= [ >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= [ >>>>>>> 183b6c5 (Manifest_cache true) ======= [ >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= authors_count: 0) >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= authors_count: 0) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= ======= [ >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= [ >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= authors_count: 0) >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true)
  32. ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD
  33. =======
  34. >>>>>>> ae2a012 (Manifest_cache true) =======
  35. 2 >>>>>>> 02a399d (Manifest_cache true) =======
  36. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> be2f578 (Manifest_cache true) =======
  37. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed97c39 (Manifest_cache true) =======
  38. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 587ce47 (Manifest_cache true) =======
  39. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> eaef86a (Fix) =======
  40. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  41. =======
  42. >>>>>>> ae2a012 (Manifest_cache true) =======
  43. =======
  44. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= =======
  45. >>>>>>> 5518ff0 (Manifest_cache true) =======
  46. 2 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) =======
  47. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) end ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= end >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= end >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true)
  48. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true)
  49. 1 =======
  50. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) =======
  51. =======
  52. >>>>>>> ae2a012 (Manifest_cache true) 2 >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) =======
  53. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> be2f578 (Manifest_cache true) =======
  54. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed97c39 (Manifest_cache true) =======
  55. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 587ce47 (Manifest_cache true) =======
  56. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> eaef86a (Fix) =======
  57. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD =======
  58. 1 >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) let(:authors) do ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= let(:authors) do >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= let(:authors) do >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true)
  59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true)
  60. =======
  61. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75be480 (Manifest_cache true) =======
  62. >>>>>>> bd8bda4 (Manifest_cache true) =======
  63. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  64. >>>>>>> 183b6c5 (Manifest_cache true) =======
  65. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  66. >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD =======
  67. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= =======
  68. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= =======
  69. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= =======
  70. >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 75be480 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) [
  71. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true)
  72. 3 ======= <<<<<<< HEAD
  73. =======
  74. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 75be480 (Manifest_cache true) =======
  75. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  76. 3 >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
  77. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true)
  78. =======
  79. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75be480 (Manifest_cache true) =======
  80. >>>>>>> a5d032d (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD =======
  81. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= =======
  82. >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 75be480 (Manifest_cache true) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
  83. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ]
  84. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true)
  85. <<<<<<< HEAD <<<<<<< HEAD =======
  86. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) =======
  87. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
  88. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  89. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  90. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  91. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= =======
  92. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= =======
  93. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= =======
  94. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= =======
  95. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= =======
  96. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= =======
  97. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true)
  98. =======
  99. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
  100. >>>>>>> bd8bda4 (Manifest_cache true) =======
  101. >>>>>>> aa7b40c (Manifest_cache true) =======
  102. >>>>>>> 183b6c5 (Manifest_cache true) =======
  103. >>>>>>> fd6db03 (Manifest_cache true) =======
  104. >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> 1577aeb (Rebased) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
  105. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  106. >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= =======
  107. >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) =======
  108. >>>>>>> 2722d07 (Manifest_cache true) =======
  109. >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75be480 (Manifest_cache true) ======= =======
  110. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true)
  111. =======
  112. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true)
  113. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  114. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= <<<<<<< HEAD
  115. =======
  116. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) =======
  117. >>>>>>> bd8bda4 (Manifest_cache true) =======
  118. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) =======
  119. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  120. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  121. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  122. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  123. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  124. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  125. >>>>>>> 7c4ea7f (Fix) =======
  126. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true)
  127. =======
  128. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> 0c9131d (Manifest_cache true) =======
  129. =======
  130. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= =======
  131. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= =======
  132. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= =======
  133. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) =======
  134. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= =======
  135. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) =======
  136. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= =======
  137. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= =======
  138. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= =======
  139. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) =======
  140. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= =======
  141. >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) 1 let(:categories) do
  142. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true)
  143. =======
  144. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true)
  145. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  146. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= <<<<<<< HEAD
  147. =======
  148. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) =======
  149. >>>>>>> bd8bda4 (Manifest_cache true) =======
  150. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) =======
  151. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  152. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  153. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  154. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  155. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  156. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  157. >>>>>>> 7c4ea7f (Fix) =======
  158. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true)
  159. =======
  160. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> 0c9131d (Manifest_cache true) =======
  161. =======
  162. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= =======
  163. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= =======
  164. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= =======
  165. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) =======
  166. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= =======
  167. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) =======
  168. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= =======
  169. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= =======
  170. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= =======
  171. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) =======
  172. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= =======
  173. >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) [
  174. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD
  175. 3 >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  176. ======= <<<<<<< HEAD
  177. =======
  178. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  179. >>>>>>> bd8bda4 (Manifest_cache true) =======
  180. >>>>>>> aa7b40c (Manifest_cache true) =======
  181. >>>>>>> 183b6c5 (Manifest_cache true) =======
  182. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true)
  183. >>>>>>> c033601 (Rebased) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) 2 =======
  184. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD
  185. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) =======
  186. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  187. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= =======
  188. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= =======
  189. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= =======
  190. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= =======
  191. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= =======
  192. 2 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= =======
  193. 3 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) =======
  194. 3 >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true)
  195. 3 =======
  196. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  197. =======
  198. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) 2 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= =======
  199. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= =======
  200. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= =======
  201. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= =======
  202. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= =======
  203. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) let(:author) { create(:author) } ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) create(:category, name: FFaker::Book.genre), >>>>>>> 2722d07 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) RSpec.describe BookDecorator do ======= let(:author) { create(:author) } >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= let(:author) { create(:author) } ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) RSpec.describe BookDecorator do >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) create(:category, name: FFaker::Book.genre), ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true)
  204. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix)
  205. 3 ======= ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true)
  206. 3 =======
  207. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  208. =======
  209. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) 2 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= =======
  210. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= =======
  211. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= =======
  212. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= =======
  213. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= =======
  214. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD subject(:book_decorator) { described_class.new(book) } <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= let(:book_decorator) { described_class.new(book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) create(:category, name: FFaker::Book.genre), ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true)
  215. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
  216. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  217. ======= <<<<<<< HEAD
  218. =======
  219. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  220. >>>>>>> bd8bda4 (Manifest_cache true) =======
  221. >>>>>>> aa7b40c (Manifest_cache true) =======
  222. >>>>>>> 183b6c5 (Manifest_cache true) =======
  223. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  224. >>>>>>> c033601 (Rebased) =======
  225. 3 ======= ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true)
  226. =======
  227. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  228. =======
  229. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
  230. >>>>>>> bd8bda4 (Manifest_cache true) =======
  231. >>>>>>> aa7b40c (Manifest_cache true) =======
  232. >>>>>>> 183b6c5 (Manifest_cache true) =======
  233. >>>>>>> fd6db03 (Manifest_cache true) =======
  234. >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true)
  235. =======
  236. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  237. =======
  238. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD =======
  239. >>>>>>> bd8bda4 (Manifest_cache true) =======
  240. >>>>>>> aa7b40c (Manifest_cache true) =======
  241. >>>>>>> 183b6c5 (Manifest_cache true) =======
  242. >>>>>>> fd6db03 (Manifest_cache true) =======
  243. >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) } ======= ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) create(:category, name: FFaker::Book.genre) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true)
  244. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  245. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  246. >>>>>>> a5d032d (Fix) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true)
  247. =======
  248. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) =======
  249. =======
  250. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75be480 (Manifest_cache true) =======
  251. >>>>>>> bd8bda4 (Manifest_cache true) =======
  252. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  253. >>>>>>> 183b6c5 (Manifest_cache true) =======
  254. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  255. >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  256. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= =======
  257. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= =======
  258. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= =======
  259. >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ]
  260. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true)
  261. =======
  262. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) =======
  263. =======
  264. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75be480 (Manifest_cache true) =======
  265. >>>>>>> bd8bda4 (Manifest_cache true) =======
  266. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  267. >>>>>>> 183b6c5 (Manifest_cache true) =======
  268. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  269. >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  270. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= =======
  271. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= =======
  272. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= =======
  273. >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) end
  274. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true)
  275. ======= >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5518ff0 (Manifest_cache true) =======
  276. ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  277. ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true)
  278. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  279. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
  280. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= =======
  281. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= =======
  282. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= =======
  283. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= =======
  284. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= =======
  285. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 5518ff0 (Manifest_cache true) =======
  286. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) =======
  287. >>>>>>> 1577aeb (Rebased) =======
  288. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= =======
  289. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= =======
  290. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= =======
  291. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= =======
  292. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= =======
  293. >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true)
  294. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  295. ======= <<<<<<< HEAD
  296. =======
  297. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  298. >>>>>>> bd8bda4 (Manifest_cache true) =======
  299. >>>>>>> aa7b40c (Manifest_cache true) =======
  300. >>>>>>> 183b6c5 (Manifest_cache true) =======
  301. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  302. =======
  303. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true)
  304. =======
  305. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) =======
  306. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= =======
  307. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= =======
  308. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= =======
  309. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= =======
  310. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) 1 >>>>>>> c033601 (Rebased) =======
  311. 1 >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true)
  312. =======
  313. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
  314. >>>>>>> bd8bda4 (Manifest_cache true) =======
  315. >>>>>>> aa7b40c (Manifest_cache true) =======
  316. >>>>>>> 183b6c5 (Manifest_cache true) =======
  317. >>>>>>> fd6db03 (Manifest_cache true) =======
  318. >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) 1 >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) describe '#full_name' do ======= ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) describe '#categories_names' do ======= it '#authors_names' do >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d66884b (Manifest_cache true) ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= describe '#categories_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= describe '#categories_names' do >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= describe '#categories_names' do >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true)
  319. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  320. ======= <<<<<<< HEAD
  321. =======
  322. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  323. >>>>>>> bd8bda4 (Manifest_cache true) =======
  324. >>>>>>> aa7b40c (Manifest_cache true) =======
  325. >>>>>>> 183b6c5 (Manifest_cache true) =======
  326. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  327. =======
  328. [
  329. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  330. >>>>>>> a5d032d (Fix) ======= =======
  331. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= =======
  332. >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true)
  333. >>>>>>> 9bebee5 (Manifest_cache true) 2 =======
  334. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
  335. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
  336. 1 >>>>>>> aa7b40c (Manifest_cache true) =======
  337. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
  338. 1 >>>>>>> fd6db03 (Manifest_cache true) =======
  339. 2 >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) =======
  340. 2 >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") } ======= let(:author) { create(:author) } >>>>>>> ee78f39 (Rebased) ======= let(:author) { create(:author) } >>>>>>> 836a973 (Rebased)
  341. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  342. >>>>>>> c033601 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) =======
  343. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD
  344. =======
  345. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  346. >>>>>>> bd8bda4 (Manifest_cache true) =======
  347. >>>>>>> aa7b40c (Manifest_cache true) =======
  348. >>>>>>> 183b6c5 (Manifest_cache true) =======
  349. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  350. >>>>>>> c033601 (Rebased) <<<<<<< HEAD =======
  351. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  352. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  353. >>>>>>> a5d032d (Fix) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD ======= =======
  354. >>>>>>> bd8bda4 (Manifest_cache true) =======
  355. >>>>>>> aa7b40c (Manifest_cache true) =======
  356. >>>>>>> 183b6c5 (Manifest_cache true) =======
  357. >>>>>>> fd6db03 (Manifest_cache true) =======
  358. >>>>>>> 998f08d (Manifest_cache true) =======
  359. >>>>>>> 7c4ea7f (Fix) create(:category, name: FFaker::Book.genre) <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 836a973 (Rebased)
  360. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
  361. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  362. ======= <<<<<<< HEAD
  363. =======
  364. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  365. >>>>>>> bd8bda4 (Manifest_cache true) =======
  366. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  367. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
  368. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= =======
  369. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  370. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  371. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  372. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  373. >>>>>>> 7c4ea7f (Fix) =======
  374. <<<<<<< HEAD =======
  375. >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 1 >>>>>>> c033601 (Rebased) =======
  376. 1 >>>>>>> a5d032d (Fix) ======= 1 >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 836a973 (Rebased) describe '#full_name' do
  377. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
  378. >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  379. ======= <<<<<<< HEAD
  380. =======
  381. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  382. >>>>>>> bd8bda4 (Manifest_cache true) =======
  383. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  384. >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD
  385. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  386. =======
  387. [
  388. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  389. >>>>>>> a5d032d (Fix) =======
  390. >>>>>>> 836a973 (Rebased) 2 =======
  391. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD =======
  392. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
  393. 1 >>>>>>> aa7b40c (Manifest_cache true) =======
  394. 1 >>>>>>> 183b6c5 (Manifest_cache true) =======
  395. 1 >>>>>>> fd6db03 (Manifest_cache true) =======
  396. 2 >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { expect(decorated_object.full_name).to eq("#{author.first_name} #{author.last_name}") } ======= ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD ======= it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true)
  397. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  398. 1 =======
  399. =======
  400. =======
  401. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true)
  402. <<<<<<< HEAD
  403. ======= <<<<<<< HEAD
  404. =======
  405. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD end >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true)
  406. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  407. >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= =======
  408. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= ======= =======
  409. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= =======
  410. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= =======
  411. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= =======
  412. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= =======
  413. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) =======
  414. >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) =======
  415. <<<<<<< HEAD =======
  416. >>>>>>> 02a399d (Manifest_cache true) ======= =======
  417. >>>>>>> a5d032d (Fix) <<<<<<< HEAD ======= >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> a5d032d (Fix)
  418. <<<<<<< HEAD <<<<<<< HEAD
  419. 1 it '#categories_names' do
  420. <<<<<<< HEAD
  421. =======
  422. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true)
  423. <<<<<<< HEAD
  424. end
  425. =======
  426. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= =======
  427. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= =======
  428. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= =======
  429. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) =======
  430. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
  431. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true)
  432. ======= >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true)
  433. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  434. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true)
  435. <<<<<<< HEAD =======
  436. >>>>>>> 0c9131d (Manifest_cache true) =======
  437. >>>>>>> b763f5b (Manifest_cache true) =======
  438. >>>>>>> be2f578 (Manifest_cache true) =======
  439. >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) =======
  440. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
  441. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  442. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  443. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  444. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  445. >>>>>>> 7c4ea7f (Fix)
  446. <<<<<<< HEAD <<<<<<< HEAD
  447. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  448. =======
  449. >>>>>>> 02a399d (Manifest_cache true) =======
  450. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
  451. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  452. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  453. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  454. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  455. >>>>>>> 7c4ea7f (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) describe '#categories_names' do >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD describe '#categories_names' do >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) it '#authors_names' do ======= <<<<<<< HEAD context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 75be480 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= it '#authors_names' do >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= describe '#categories_names' do >>>>>>> 7c4ea7f (Fix)
  456. <<<<<<< HEAD <<<<<<< HEAD
  457. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  458. 2 =======
  459. 1 >>>>>>> 02a399d (Manifest_cache true) =======
  460. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= =======
  461. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  462. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  463. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  464. 1 >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  465. 2 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= <<<<<<< HEAD it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 7c4ea7f (Fix) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true)
  466. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  467. ======= <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> b15044a (Manifest_cache true)
  468. 1 =======
  469. >>>>>>> fd6db03 (Manifest_cache true) =======
  470. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> 998f08d (Manifest_cache true)
  471. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true)
  472. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  473. 1 =======
  474. =======
  475. =======
  476. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> fd6db03 (Manifest_cache true) =======
  477. 1 >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD =======
  478. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 75be480 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75be480 (Manifest_cache true) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD ======= end >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 75be480 (Manifest_cache true)
  479. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75be480 (Manifest_cache true)
  480. ======= <<<<<<< HEAD
  481. =======
  482. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) =======
  483. >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD =======
  484. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 75be480 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) end >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true)
  485. <<<<<<< HEAD
  486. <<<<<<< HEAD =======
  487. >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD =======
  488. >>>>>>> a5d032d (Fix) ======= =======
  489. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased)
  490. <<<<<<< HEAD
  491. 1 it '#categories_names' do
  492. ======= >>>>>>> 1577aeb (Rebased)
  493. 1 <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel')
  494. end
  495. =======
  496. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> a5d032d (Fix)
  497. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  498. 1 =======
  499. =======
  500. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) it '#categories_names' do
  501. <<<<<<< HEAD
  502. =======
  503. >>>>>>> 02a399d (Manifest_cache true) =======
  504. >>>>>>> cde4834 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) ======= describe '#authors_names' do >>>>>>> 1577aeb (Rebased)
  505. <<<<<<< HEAD <<<<<<< HEAD
  506. end
  507. =======
  508. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  509. >>>>>>> bd8bda4 (Manifest_cache true) =======
  510. >>>>>>> aa7b40c (Manifest_cache true) =======
  511. >>>>>>> 183b6c5 (Manifest_cache true) =======
  512. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
  513. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  514. 1 ======= ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) <<<<<<< HEAD
  515. =======
  516. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) it '#categories_names' do
  517. <<<<<<< HEAD
  518. =======
  519. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true)
  520. <<<<<<< HEAD
  521. end
  522. =======
  523. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  524. >>>>>>> bd8bda4 (Manifest_cache true) =======
  525. >>>>>>> aa7b40c (Manifest_cache true) =======
  526. >>>>>>> 183b6c5 (Manifest_cache true) =======
  527. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
  528. <<<<<<< HEAD ======= <<<<<<< HEAD
  529. ======= >>>>>>> 7375d4b (Manifest_cache true)
  530. end ======= <<<<<<< HEAD it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true)
  531. <<<<<<< HEAD
  532. =======
  533. >>>>>>> 02a399d (Manifest_cache true) ======= it '#categories_names' do >>>>>>> cde4834 (Manifest_cache true)
  534. <<<<<<< HEAD ======= <<<<<<< HEAD
  535. =======
  536. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> cde4834 (Manifest_cache true) =======
  537. >>>>>>> 1577aeb (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it '#categories_names' do ======= <<<<<<< HEAD it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> cde4834 (Manifest_cache true) ======= it { >>>>>>> 1577aeb (Rebased)
  538. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  539. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  540. end
  541. end
  542. <<<<<<< HEAD <<<<<<< HEAD
  543. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
  544. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
  545. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= =======
  546. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= =======
  547. >>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price)
  548. <<<<<<< HEAD >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= =======
  549. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= =======
  550. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 872e675 (Fix) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk')
  551. ]
  552. end
  553. 1 let(:categories) do
  554. [
  555. 2 FactoryBot.create(:category, name: 'Poetry'),
  556. FactoryBot.create(:category, name: 'Novel')
  557. ]
  558. end
  559. ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
  560. =======
  561. =======
  562. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true)
  563. <<<<<<< HEAD
  564. 1 <<<<<<< HEAD context 'when decorate' do ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) it '#authors_names' do ======= <<<<<<< HEAD context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
  565. 1 <<<<<<< HEAD it '#authors_names' do ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= <<<<<<< HEAD it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
  566. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  567. ======= <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
  568. 1 expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
  569. end
  570. 1 it '#categories_names' do
  571. ======= <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true)
  572. =======
  573. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true)
  574. <<<<<<< HEAD
  575. end
  576. =======
  577. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
  578. <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= end
  579. ======= <<<<<<< HEAD
  580. =======
  581. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) 1 <<<<<<< HEAD it '#categories_names' do ======= <<<<<<< HEAD it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true)
  582. <<<<<<< HEAD
  583. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  584. end
  585. end
  586. <<<<<<< HEAD
  587. <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
  588. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  589. >>>>>>> c033601 (Rebased) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b28889f (Fix) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
>>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> b28889f (Fix) ======= ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true)
>>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= =======
>>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= =======
>>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased)

spec/decorators/book_decorator_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) 15 relevant lines. 15 lines covered and ======= <<<<<<< HEAD 13 relevant lines. 13 lines covered and ======= 12 relevant lines. 12 lines covered and >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) ======= 15 relevant lines. 15 lines covered and >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= 15 relevant lines. 15 lines covered and >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= 15 relevant lines. 15 lines covered and >>>>>>> 836a973 (Rebased) 0 lines missed.
    
  1. 1 RSpec.describe BookDecorator do
  2. 4 subject(:decorated_object) { described_class.new(book) }
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 836a973 (Rebased)
  4. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) let(:book) do ======= resources :books, only: %i[show index] >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe BookDecorator do ======= resources :books, only: %i[show index] >>>>>>> 752f0c0 (Featire specs) ======= resources :books, only: %i[show index] >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) do >>>>>>> a5d032d (Fix) ======= let(:book) do >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= RSpec.describe BookDecorator do ======= resources :books, only: %i[show index] >>>>>>> 752f0c0 (Featire specs) ======= resources :books, only: %i[show index] >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) do >>>>>>> a5d032d (Fix) ======= >>>>>>> 9620751 (Featire specs) ======= ======= RSpec.describe BookDecorator do ======= let(:book) do >>>>>>> 836a973 (Rebased)
  5. <<<<<<< HEAD
  6. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true)
  7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  8. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true)
  9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  10. 3 <<<<<<< HEAD let(:book_decorator) { described_class.new(book) } ======= subject(:book_decorator) { described_class.new(book) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true)
  11. <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 836a973 (Rebased)
  12. 3 create(:book, price_cents: 123, authors: authors, categories: categories,
  13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) =======
  14. >>>>>>> ae2a012 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 307f31f (Manifest_cache true) ======= =======
  15. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD categories_count: 0, ======= <<<<<<< HEAD ======= ======= categories_count: 0, >>>>>>> a5d032d (Fix) ======= categories_count: 0, >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) categories_count: 0, ======= <<<<<<< HEAD ======= ======= categories_count: 0, >>>>>>> a5d032d (Fix) ======= ======= categories_count: 0, ======= ======= ======= categories_count: 0, >>>>>>> 836a973 (Rebased)
  16. <<<<<<< HEAD <<<<<<< HEAD
  17. =======
  18. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true)
  19. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  20. =======
  21. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true)
  22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  23. =======
  24. >>>>>>> ae2a012 (Manifest_cache true) 1 >>>>>>> 7375d4b (Manifest_cache true) let(:authors) do >>>>>>> 02a399d (Manifest_cache true) ======= let(:authors) do >>>>>>> bd8bda4 (Manifest_cache true) ======= let(:authors) do >>>>>>> aa7b40c (Manifest_cache true) ======= let(:authors) do >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true)
  25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 836a973 (Rebased)
  26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) authors_count: 0) ======= [ >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e9f3851 (Manifest_cache true) ======= [ >>>>>>> bd8bda4 (Manifest_cache true) ======= [ >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= [ >>>>>>> 183b6c5 (Manifest_cache true) ======= [ >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= authors_count: 0) >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD authors_count: 0) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= [ >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= [ >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= authors_count: 0) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= authors_count: 0) >>>>>>> 836a973 (Rebased)
  27. <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD
  28. =======
  29. >>>>>>> ae2a012 (Manifest_cache true) =======
  30. 2 >>>>>>> 02a399d (Manifest_cache true) =======
  31. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) =======
  32. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) =======
  33. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) =======
  34. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  35. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  36. =======
  37. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> ee78f39 (Rebased) =======
  38. =======
  39. >>>>>>> ae2a012 (Manifest_cache true) ======= =======
  40. >>>>>>> e9f3851 (Manifest_cache true) =======
  41. 2 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) =======
  42. >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) end ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e9f3851 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD end >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Vlad', last_name: 'Todorchuk'), >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= end >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= end >>>>>>> 836a973 (Rebased)
  43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  44. 1 =======
  45. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  46. =======
  47. >>>>>>> ae2a012 (Manifest_cache true) 2 >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) =======
  48. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) =======
  49. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) =======
  50. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) =======
  51. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  52. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  53. 1 >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  54. 1 >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) let(:authors) do ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e9f3851 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= let(:authors) do >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD let(:authors) do >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= FactoryBot.create(:author, first_name: 'Stas', last_name: 'Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= let(:authors) do >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= let(:authors) do >>>>>>> 836a973 (Rebased)
  55. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  56. =======
  57. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) =======
  58. >>>>>>> bd8bda4 (Manifest_cache true) =======
  59. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  60. >>>>>>> 183b6c5 (Manifest_cache true) =======
  61. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  62. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD
  63. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= =======
  64. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= =======
  65. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= =======
  66. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  67. >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 836a973 (Rebased) [
  68. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  69. 3 ======= <<<<<<< HEAD
  70. =======
  71. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 307f31f (Manifest_cache true) =======
  72. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  73. 3 >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  74. 3 >>>>>>> 836a973 (Rebased) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name),
  75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  76. =======
  77. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) =======
  78. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD
  79. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= =======
  80. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  81. >>>>>>> 836a973 (Rebased) create(:author, first_name: FFaker::Name.first_name, last_name: FFaker::Name.last_name)
  82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 836a973 (Rebased) ]
  83. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
  84. =======
  85. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e9f3851 (Manifest_cache true) =======
  86. >>>>>>> bd8bda4 (Manifest_cache true) =======
  87. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  88. >>>>>>> 183b6c5 (Manifest_cache true) =======
  89. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  90. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD
  91. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= =======
  92. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= =======
  93. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= =======
  94. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  95. >>>>>>> 836a973 (Rebased) <<<<<<< HEAD expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> 836a973 (Rebased)
  96. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= ======= ======= ======= =======
  97. >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> add330c (Manifest_cache true) =======
  98. >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) =======
  99. >>>>>>> 96aecde (Manifest_cache true) >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  100. =======
  101. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  102. =======
  103. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) =======
  104. >>>>>>> bd8bda4 (Manifest_cache true) =======
  105. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  106. >>>>>>> 183b6c5 (Manifest_cache true) =======
  107. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  108. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD
  109. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= =======
  110. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= =======
  111. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= =======
  112. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  113. >>>>>>> 836a973 (Rebased) 1 let(:categories) do
  114. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  115. =======
  116. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  117. =======
  118. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) =======
  119. >>>>>>> bd8bda4 (Manifest_cache true) =======
  120. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  121. >>>>>>> 183b6c5 (Manifest_cache true) =======
  122. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  123. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD
  124. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= =======
  125. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= =======
  126. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= =======
  127. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  128. >>>>>>> 836a973 (Rebased) [
  129. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  130. 3 =======
  131. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  132. =======
  133. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) 2 >>>>>>> 02a399d (Manifest_cache true) =======
  134. 2 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) =======
  135. 2 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) =======
  136. 2 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) =======
  137. 2 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  138. 3 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  139. 3 >>>>>>> ee78f39 (Rebased) ======= 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= 2 >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) =======
  140. 3 >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) create(:category, name: FFaker::Book.genre), ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e9f3851 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= create(:category, name: FFaker::Book.genre), >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD create(:category, name: FFaker::Book.genre), >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Poetry'), >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= create(:category, name: FFaker::Book.genre), >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre), >>>>>>> 836a973 (Rebased)
  141. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  142. =======
  143. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  144. =======
  145. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) =======
  146. >>>>>>> bd8bda4 (Manifest_cache true) =======
  147. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  148. >>>>>>> 183b6c5 (Manifest_cache true) =======
  149. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  150. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD
  151. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= =======
  152. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= =======
  153. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= =======
  154. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  155. >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) create(:category, name: FFaker::Book.genre) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e9f3851 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= create(:category, name: FFaker::Book.genre) >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD create(:category, name: FFaker::Book.genre) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= FactoryBot.create(:category, name: 'Novel') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= create(:category, name: FFaker::Book.genre) >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= create(:category, name: FFaker::Book.genre) >>>>>>> 836a973 (Rebased)
  156. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  157. =======
  158. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  159. =======
  160. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) =======
  161. >>>>>>> bd8bda4 (Manifest_cache true) =======
  162. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  163. >>>>>>> 183b6c5 (Manifest_cache true) =======
  164. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  165. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD
  166. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= =======
  167. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= =======
  168. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= =======
  169. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  170. >>>>>>> 836a973 (Rebased) ]
  171. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  172. =======
  173. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  174. =======
  175. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) =======
  176. >>>>>>> bd8bda4 (Manifest_cache true) =======
  177. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  178. >>>>>>> 183b6c5 (Manifest_cache true) =======
  179. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  180. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD
  181. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= =======
  182. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= =======
  183. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= =======
  184. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) =======
  185. >>>>>>> 836a973 (Rebased) end
  186. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  187. ======= >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  188. ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= =======
  189. ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  190. 3 let(:book) { FactoryBot.create(:book, authors: authors, categories: categories) }
  191. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  192. >>>>>>> 02a399d (Manifest_cache true) =======
  193. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  194. >>>>>>> aa7b40c (Manifest_cache true) =======
  195. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  196. >>>>>>> fd6db03 (Manifest_cache true) =======
  197. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  198. >>>>>>> ee78f39 (Rebased) =======
  199. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= =======
  200. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= =======
  201. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= =======
  202. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) =======
  203. >>>>>>> 836a973 (Rebased) ======= end >>>>>>> 0b5b269 (Fix)
  204. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
  205. =======
  206. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e9f3851 (Manifest_cache true) =======
  207. >>>>>>> bd8bda4 (Manifest_cache true) =======
  208. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  209. >>>>>>> 183b6c5 (Manifest_cache true) =======
  210. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  211. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD
  212. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= =======
  213. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= =======
  214. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= =======
  215. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) =======
  216. >>>>>>> 836a973 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) describe '#categories_names' do ======= it '#authors_names' do >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= context 'when decorate' do ======= it '#authors_names' do >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) ======= context 'when decorate' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#categories_names' do >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= describe '#categories_names' do >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= it '#authors_names' do >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= it '#authors_names' do >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= it '#authors_names' do >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= describe '#categories_names' do >>>>>>> 836a973 (Rebased)
  217. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true)
  218. 2 =======
  219. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) =======
  220. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) =======
  221. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) =======
  222. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) =======
  223. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) =======
  224. 2 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  225. 2 >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) =======
  226. 2 >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= it '#authors_names' do ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) ======= it '#authors_names' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= it { expect(decorated_object.categories_names).to eq("#{categories.first.name}, #{categories.last.name}") } >>>>>>> 836a973 (Rebased)
  227. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true)
  228. 1 =======
  229. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e9f3851 (Manifest_cache true) =======
  230. =======
  231. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> fd6db03 (Manifest_cache true) =======
  232. 1 <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') ======= end >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  233. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true)
  234. ======= <<<<<<< HEAD
  235. =======
  236. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) =======
  237. >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= =======
  238. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) end >>>>>>> 7375d4b (Manifest_cache true)
  239. <<<<<<< HEAD
  240. <<<<<<< HEAD =======
  241. >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) =======
  242. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  243. >>>>>>> ee78f39 (Rebased) ======= ======= =======
  244. >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= =======
  245. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) =======
  246. >>>>>>> 836a973 (Rebased) ======= >>>>>>> 75be480 (Manifest_cache true) ======= =======
  247. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> fd6db03 (Manifest_cache true) ======= >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= end >>>>>>> 1a9aba9 (Fix)
  248. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix)
  249. 1 it '#categories_names' do
  250. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  251. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) ======= >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) end
  252. =======
  253. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> a5d032d (Fix)
  254. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  255. 1 =======
  256. =======
  257. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) it '#categories_names' do
  258. <<<<<<< HEAD
  259. =======
  260. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true)
  261. <<<<<<< HEAD
  262. end
  263. =======
  264. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= =======
  265. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= =======
  266. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= =======
  267. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) =======
  268. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fd6db03 (Manifest_cache true) ======= end >>>>>>> a5d032d (Fix) ======= end >>>>>>> ee78f39 (Rebased) ======= expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk') >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price)
  269. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  270. 1 ======= ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true)
  271. =======
  272. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) it '#categories_names' do
  273. <<<<<<< HEAD
  274. =======
  275. >>>>>>> 02a399d (Manifest_cache true) 1 <<<<<<< HEAD expect(book_decorator.categories_names).to eq('Poetry, Novel') ======= <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true)
  276. <<<<<<< HEAD
  277. end
  278. =======
  279. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) =======
  280. >>>>>>> bd8bda4 (Manifest_cache true) =======
  281. >>>>>>> aa7b40c (Manifest_cache true) =======
  282. >>>>>>> 183b6c5 (Manifest_cache true) =======
  283. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) expect(book_decorator.authors_names).to eq('Vlad Todorchuk, Stas Todorchuk')
  284. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  285. =======
  286. >>>>>>> 02a399d (Manifest_cache true) =======
  287. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  288. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 872e675 (Fix) ======= =======
  289. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) =======
  290. >>>>>>> 836a973 (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= =======
  291. >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> eaef86a (Fix) ======= =======
  292. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix)
  293. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 1a9aba9 (Fix)
  294. =======
  295. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  296. >>>>>>> fd6db03 (Manifest_cache true) =======
  297. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  298. >>>>>>> ee78f39 (Rebased) ======= ======= ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) =======
  299. >>>>>>> fd6db03 (Manifest_cache true) =======
  300. >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD ======= =======
  301. >>>>>>> fd6db03 (Manifest_cache true) =======
  302. >>>>>>> 998f08d (Manifest_cache true) =======
  303. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD =======
  304. >>>>>>> 836a973 (Rebased) ======= =======
  305. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= ======= ======= ======= >>>>>>> 35d9b13 (Manifest_cache true) =======
  306. >>>>>>> fd6db03 (Manifest_cache true) =======
  307. >>>>>>> a5d032d (Fix) ======= ======= =======
  308. >>>>>>> fd6db03 (Manifest_cache true) =======
  309. >>>>>>> 998f08d (Manifest_cache true) =======
  310. >>>>>>> 7c4ea7f (Fix) 1 describe '#authors_names' do
  311. <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
  312. =======
  313. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= =======
  314. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) ======= it '#categories_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#authors_names' do >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true)
  315. >>>>>>> 587ce47 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  316. =======
  317. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= =======
  318. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= =======
  319. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= =======
  320. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= <<<<<<< HEAD
  321. >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= =======
  322. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= =======
  323. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe '#authors_names' do ======= it { <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= it { >>>>>>> eaef86a (Fix) ======= it { >>>>>>> 587ce47 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD it '#categories_names' do >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= describe '#authors_names' do >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= <<<<<<< HEAD it { >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix)
  324. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 8874887 (Manifest_cache true)
  325. =======
  326. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= =======
  327. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) =======
  328. >>>>>>> 836a973 (Rebased) ======= =======
  329. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b5b269 (Fix) describe '#authors_names' do
  330. <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD
  331. =======
  332. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= =======
  333. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) ======= it '#categories_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#authors_names' do >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) it { ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cae047f (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD ======= it { >>>>>>> 836a973 (Rebased) ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true)
  334. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  335. =======
  336. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= =======
  337. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= <<<<<<< HEAD ======= ======= >>>>>>> a9e654b (Manifest_cache true) <<<<<<< HEAD
  338. >>>>>>> a5d032d (Fix) =======
  339. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= =======
  340. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> a9e654b (Manifest_cache true) ======= =======
  341. >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe '#authors_names' do ======= it '#categories_names' do >>>>>>> 02a399d (Manifest_cache true) ======= it '#categories_names' do >>>>>>> fd6db03 (Manifest_cache true) ======= describe '#authors_names' do >>>>>>> a5d032d (Fix) ======= describe '#authors_names' do >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) it { <<<<<<< HEAD ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= <<<<<<< HEAD it { >>>>>>> a5d032d (Fix) ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix)
  342. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d15fe1d (Fix)
  343. =======
  344. >>>>>>> 02a399d (Manifest_cache true) =======
  345. >>>>>>> fd6db03 (Manifest_cache true) =======
  346. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD =======
  347. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> d15fe1d (Fix) it { <<<<<<< HEAD ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 02a399d (Manifest_cache true) ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD it { >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD ======= it { >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= it { >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix)
  348. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix)
  349. 1 expect(decorated_object.authors_names).to eq("#{authors.first.first_name} #{authors.first.last_name}, " \
  350. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 7375d4b (Manifest_cache true)
  351. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true)
  352. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) end ======= >>>>>>> 0c9131d (Manifest_cache true)
  353. <<<<<<< HEAD
  354. ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= end >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> ee5935f (Manifest_cache true)
  355. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  356. 1 =======
  357. >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) =======
  358. 1 >>>>>>> ee5935f (Manifest_cache true) =======
  359. 1 >>>>>>> 0c9131d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= end >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= it '#categories_names' do >>>>>>> ee5935f (Manifest_cache true) ======= it '#categories_names' do >>>>>>> 0c9131d (Manifest_cache true)
  360. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  361. 1 =======
  362. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price)
  363. <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) =======
  364. ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= end >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
  365. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  366. 1 =======
  367. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price)
  368. <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) =======
  369. ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= end >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
  370. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  371. 1 =======
  372. >>>>>>> 2d71369 (Fix book_spec decrease quantity and price)
  373. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true)
  374. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it '#categories_names' do ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 0bdcc5e (Manifest_cache true) ======= it '#categories_names' do >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) it '#categories_names' do ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= it '#categories_names' do >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> ee5935f (Manifest_cache true) ======= it '#categories_names' do >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= it '#categories_names' do ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= ======= it '#categories_names' do >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 0c9131d (Manifest_cache true) ======= it '#categories_names' do >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= it '#categories_names' do ======= expect(book_decorator.categories_names).to eq('Poetry, Novel') >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= ======= it '#categories_names' do >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
  375. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
  376. 1 expect(book_decorator.categories_names).to eq('Poetry, Novel')
  377. end
  378. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  379. >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  380. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= =======
  381. >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) =======
  382. >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  383. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= =======
  384. >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) =======
  385. >>>>>>> cde4834 (Manifest_cache true) =======
  386. >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  387. >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= =======
  388. >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) end
  389. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price)
  390. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) =======
  391. >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  392. >>>>>>> ee78f39 (Rebased) =======
  393. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= =======
  394. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= =======
  395. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) =======
  396. >>>>>>> 836a973 (Rebased) =======
  397. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> d15fe1d (Fix) ======= =======
  398. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= =======
  399. >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) =======
  400. >>>>>>> 1577aeb (Rebased) =======
  401. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= =======
  402. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= =======
  403. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) "#{authors.last.first_name} #{authors.last.last_name}")
  404. }
  405. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) =======
  406. >>>>>>> 02a399d (Manifest_cache true) =======
  407. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= =======
  408. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) =======
  409. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= =======
  410. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= =======
  411. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= =======
  412. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) end
  413. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> a5d032d (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix)
  414. 1 describe '#price' do
  415. 2 it { expect(decorated_object.price).to eq(1.23.to_money) }
  416. end
  417. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) =======
  418. >>>>>>> d0dc1f1 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs)
  419. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) =======
  420. >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) =======
  421. >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) =======
  422. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 35d9b13 (Manifest_cache true) =======
  423. >>>>>>> fd6db03 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= =======
  424. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= =======
  425. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= =======
  426. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  427. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= =======
  428. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= =======
  429. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= =======
  430. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) =======
  431. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= =======
  432. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= =======
  433. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= =======
  434. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  435. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) >>>>>>> d15fe1d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 93db8b1 (Featire specs) =======
  436. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> 5f76842 (Featire specs) =======
  437. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 78d0719 (Featire specs) ======= =======
  438. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) =======
  439. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= =======
  440. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= =======
  441. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  442. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= =======
  443. >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= =======
  444. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= =======
  445. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= =======
  446. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= =======
  447. >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
======= ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs)
>>>>>>> df37394 (Featire specs) =======
>>>>>>> ee78f39 (Rebased) =======
>>>>>>> 836a973 (Rebased) =======
>>>>>>> 1577aeb (Rebased)

spec/factories/addresses.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :address do
  3. end
  4. end

spec/factories/admin_users.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :admin_user do
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 15 ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs)
  5. 13 >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs)
  6. 13 =======
  7. 13 >>>>>>> 2a25e4c (Featire specs) =======
  8. 13 >>>>>>> 8c32a77 (Featire specs) =======
  9. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) =======
  10. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 113da87 (Featire specs) =======
  11. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) =======
  12. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) =======
  13. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) =======
  14. 1 >>>>>>> 49e8a6c (Rebased) =======
  15. 15 >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs)
  16. 15 =======
  17. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) =======
  18. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) =======
  19. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) =======
  20. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) =======
  21. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======
  22. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) =======
  23. 15 >>>>>>> 1d59aaa (Fix) =======
  24. 13 >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
  25. 1 >>>>>>> 078304c (Rebased) =======
  26. 15 >>>>>>> d15fe1d (Fix) =======
  27. 15 =======
  28. 1 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) =======
  29. 15 >>>>>>> 0b5b269 (Fix) =======
  30. 15 =======
  31. 1 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) =======
  32. 15 >>>>>>> 1ac6be1 (Fix) =======
  33. 13 >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) =======
  34. 1 >>>>>>> bebaea7 (Rebased) =======
  35. 15 >>>>>>> eaef86a (Fix) =======
  36. 15 =======
  37. 1 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) =======
  38. 15 >>>>>>> 1a9aba9 (Fix) =======
  39. 15 =======
  40. 1 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) =======
  41. 15 >>>>>>> 49e3b70 (Fix) =======
  42. 15 =======
  43. 1 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======
  44. 15 >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) email { FFaker::Internet.email }
  45. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  46. 15 ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs)
  47. 13 >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs)
  48. 13 =======
  49. 13 >>>>>>> 2a25e4c (Featire specs) =======
  50. 13 >>>>>>> 8c32a77 (Featire specs) =======
  51. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) =======
  52. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 113da87 (Featire specs) =======
  53. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) =======
  54. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) =======
  55. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) =======
  56. 1 >>>>>>> 49e8a6c (Rebased) =======
  57. 15 >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs)
  58. 15 =======
  59. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) =======
  60. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) =======
  61. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) =======
  62. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) =======
  63. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======
  64. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) =======
  65. 15 >>>>>>> 1d59aaa (Fix) =======
  66. 13 >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
  67. 1 >>>>>>> 078304c (Rebased) =======
  68. 15 >>>>>>> d15fe1d (Fix) =======
  69. 15 =======
  70. 1 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) =======
  71. 15 >>>>>>> 0b5b269 (Fix) =======
  72. 15 =======
  73. 1 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) =======
  74. 15 >>>>>>> 1ac6be1 (Fix) =======
  75. 13 >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) =======
  76. 1 >>>>>>> bebaea7 (Rebased) =======
  77. 15 >>>>>>> eaef86a (Fix) =======
  78. 15 =======
  79. 1 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) =======
  80. 15 >>>>>>> 1a9aba9 (Fix) =======
  81. 15 =======
  82. 1 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) =======
  83. 15 >>>>>>> 49e3b70 (Fix) =======
  84. 15 =======
  85. 1 >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======
  86. 15 >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) password { 'adminPassword' }
  87. end
  88. =======
  89. >>>>>>> cde4834 (Manifest_cache true) end

spec/factories/authors.rb

<<<<<<< HEAD 80.0% ======= 100.0% >>>>>>> cde4834 (Manifest_cache true) lines covered

<<<<<<< HEAD 10 relevant lines. 8 lines covered and 2 lines missed. ======= 4 relevant lines. 4 lines covered and 0 lines missed. >>>>>>> cde4834 (Manifest_cache true)
    
  1. 1 FactoryBot.define do
  2. 1 factory :author do
  3. <<<<<<< HEAD
  4. 5 =======
  5. 1 >>>>>>> cde4834 (Manifest_cache true) first_name { FFaker::Name.first_name }
  6. <<<<<<< HEAD
  7. 5 =======
  8. 1 >>>>>>> cde4834 (Manifest_cache true) last_name { FFaker::Name.last_name }
  9. <<<<<<< HEAD
  10. 1 transient do
  11. 1 books_count { 1 }
  12. end
  13. 1 after :create do |author, books_count|
  14. 10 author.books do
  15. Array.new(books_count) do
  16. association(:author, books: [instance])
  17. end
  18. end
  19. end
  20. ======= >>>>>>> cde4834 (Manifest_cache true) end
  21. <<<<<<< HEAD
  22. =======
  23. >>>>>>> cde4834 (Manifest_cache true) end

spec/factories/authors.rb

80.0% lines covered

10 relevant lines. 8 lines covered and 2 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :author do
  3. 5 first_name { FFaker::Name.first_name }
  4. 5 last_name { FFaker::Name.last_name }
  5. 1 transient do
  6. 1 books_count { 1 }
  7. end
  8. 1 after :create do |author, books_count|
  9. 10 author.books do
  10. Array.new(books_count) do
  11. association(:author, books: [instance])
  12. end
  13. end
  14. end
  15. end
  16. end

spec/factories/authors_books.rb

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :authors_book do
  3. 1 author
  4. 1 book
  5. end
  6. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs)

spec/factories/billings.rb

=======

spec/factories/books.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) =======

spec/factories/billings.rb

>>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) =======

spec/factories/books.rb

>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) =======

spec/factories/books.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) =======

spec/factories/books.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) =======

spec/factories/books.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) =======

spec/factories/billings.rb

>>>>>>> bebaea7 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======

spec/factories/books.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) =======

spec/factories/billings.rb

>>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) =======

spec/factories/billings.rb

>>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======

spec/factories/billings.rb

>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= 8 relevant lines. 8 lines covered and >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> bebaea7 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD factory :billing do ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) factory :billing do
  3. 1 user
  4. 1 address { FFaker::AddressUA.street_address }
  5. 1 city { FFaker::AddressUA.city }
  6. 1 zip { FFaker::AddressUA.zip_code }
  7. 1 country { FFaker::AddressUA.country }
  8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
  9. end
  10. end

spec/factories/books.rb

80.95% lines covered

21 relevant lines. 17 lines covered and 4 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :book do >>>>>>> 1577aeb (Rebased)
  3. <<<<<<< HEAD
  4. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  5. 3 ======= <<<<<<< HEAD
  6. 82 =======
  7. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs)
  8. 105 >>>>>>> 1cb2e82 (Featire specs) ======= =======
  9. 80 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  10. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  11. 80 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
  12. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  13. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
  14. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  15. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  16. 95 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs)
  17. 95 =======
  18. 105 >>>>>>> c1749d5 (Featire specs) =======
  19. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> c1749d5 (Featire specs) =======
  20. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  21. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= =======
  22. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> ebe5361 (Featire specs) =======
  23. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= =======
  24. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  25. 97 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs)
  26. 97 =======
  27. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
  28. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
  29. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= =======
  30. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
  31. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> d3d58e0 (Featire specs) =======
  32. 80 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= =======
  33. 105 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  34. 105 =======
  35. 105 >>>>>>> 65f3409 (Featire specs) =======
  36. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= =======
  37. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= =======
  38. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= =======
  39. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= =======
  40. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= =======
  41. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= =======
  42. 105 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= =======
  43. 80 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= =======
  44. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= =======
  45. 105 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) user
  46. <<<<<<< HEAD
  47. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  48. 3 ======= <<<<<<< HEAD
  49. 92 =======
  50. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs)
  51. 119 >>>>>>> 1cb2e82 (Featire specs) ======= =======
  52. 90 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  53. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  54. 90 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
  55. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  56. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
  57. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  58. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  59. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs)
  60. 109 =======
  61. 119 >>>>>>> c1749d5 (Featire specs) =======
  62. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> c1749d5 (Featire specs) =======
  63. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  64. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= =======
  65. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> ebe5361 (Featire specs) =======
  66. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= =======
  67. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  68. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs)
  69. 111 =======
  70. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
  71. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
  72. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= =======
  73. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
  74. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> d3d58e0 (Featire specs) =======
  75. 90 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= =======
  76. 119 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  77. 119 =======
  78. 119 >>>>>>> 65f3409 (Featire specs) =======
  79. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= =======
  80. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= =======
  81. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= =======
  82. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= =======
  83. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= =======
  84. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= =======
  85. 119 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= =======
  86. 90 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= =======
  87. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= =======
  88. 119 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) address { FFaker::AddressUA.street_address }
  89. <<<<<<< HEAD
  90. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  91. 3 ======= <<<<<<< HEAD
  92. 82 =======
  93. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs)
  94. 98 >>>>>>> 1cb2e82 (Featire specs) ======= =======
  95. 80 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  96. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  97. 80 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
  98. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  99. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
  100. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  101. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  102. 92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs)
  103. 92 =======
  104. 98 >>>>>>> c1749d5 (Featire specs) =======
  105. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> c1749d5 (Featire specs) =======
  106. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  107. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= =======
  108. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> ebe5361 (Featire specs) =======
  109. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= =======
  110. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  111. 94 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs)
  112. 94 =======
  113. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
  114. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
  115. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= =======
  116. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
  117. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> d3d58e0 (Featire specs) =======
  118. 80 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= =======
  119. 98 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  120. 98 =======
  121. 98 >>>>>>> 65f3409 (Featire specs) =======
  122. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= =======
  123. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= =======
  124. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= =======
  125. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= =======
  126. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= =======
  127. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= =======
  128. 98 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= =======
  129. 80 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= =======
  130. 80 >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= =======
  131. 98 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD city { FFaker::AddressUA.city } ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) price_cents { FFaker::Number.rand(10_000) } ======= price { FFaker::Number.rand(100) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> bebaea7 (Rebased) ======= price_cents { FFaker::Number.rand(10_000) } ======= price { FFaker::Number.rand(100) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 1a9aba9 (Fix) ======= price_cents { FFaker::Number.rand(10_000) } ======= price { FFaker::Number.rand(100) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 49e3b70 (Fix) ======= price_cents { FFaker::Number.rand(10_000) } ======= price { FFaker::Number.rand(100) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= price { FFaker::Number.rand(100) } >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= price_cents { FFaker::Number.rand(10_000) } >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  132. <<<<<<< HEAD
  133. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  134. 3 ======= <<<<<<< HEAD
  135. 92 =======
  136. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs)
  137. 119 >>>>>>> 1cb2e82 (Featire specs) ======= =======
  138. 90 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  139. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  140. 90 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
  141. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  142. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
  143. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  144. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  145. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs)
  146. 109 =======
  147. 119 >>>>>>> c1749d5 (Featire specs) =======
  148. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> c1749d5 (Featire specs) =======
  149. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  150. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= =======
  151. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> ebe5361 (Featire specs) =======
  152. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= =======
  153. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  154. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs)
  155. 111 =======
  156. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
  157. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
  158. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= =======
  159. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
  160. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> d3d58e0 (Featire specs) =======
  161. 90 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= =======
  162. 119 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  163. 119 =======
  164. 119 >>>>>>> 65f3409 (Featire specs) =======
  165. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= =======
  166. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= =======
  167. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= =======
  168. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= =======
  169. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= =======
  170. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= =======
  171. 119 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= =======
  172. 90 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= =======
  173. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= =======
  174. 119 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) zip { FFaker::AddressUA.zip_code }
  175. <<<<<<< HEAD
  176. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  177. 3 ======= <<<<<<< HEAD
  178. 92 =======
  179. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs)
  180. 119 >>>>>>> 1cb2e82 (Featire specs) ======= =======
  181. 90 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  182. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  183. 90 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
  184. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  185. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
  186. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  187. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  188. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs)
  189. 109 =======
  190. 119 >>>>>>> c1749d5 (Featire specs) =======
  191. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> c1749d5 (Featire specs) =======
  192. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  193. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= =======
  194. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> ebe5361 (Featire specs) =======
  195. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= =======
  196. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  197. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs)
  198. 111 =======
  199. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
  200. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
  201. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= =======
  202. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
  203. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> d3d58e0 (Featire specs) =======
  204. 90 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= =======
  205. 119 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  206. 119 =======
  207. 119 >>>>>>> 65f3409 (Featire specs) =======
  208. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= =======
  209. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= =======
  210. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= =======
  211. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= =======
  212. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= =======
  213. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= =======
  214. 119 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= =======
  215. 90 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= =======
  216. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= =======
  217. 119 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) country { FFaker::AddressUA.country }
  218. <<<<<<< HEAD
  219. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  220. 3 ======= <<<<<<< HEAD
  221. 92 =======
  222. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs)
  223. 119 >>>>>>> 1cb2e82 (Featire specs) ======= =======
  224. 90 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  225. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  226. 90 >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD
  227. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  228. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
  229. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  230. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  231. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs)
  232. 109 =======
  233. 119 >>>>>>> c1749d5 (Featire specs) =======
  234. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> c1749d5 (Featire specs) =======
  235. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  236. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= =======
  237. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> ebe5361 (Featire specs) =======
  238. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= =======
  239. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  240. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs)
  241. 111 =======
  242. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
  243. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= =======
  244. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= =======
  245. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= =======
  246. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= ======= >>>>>>> d3d58e0 (Featire specs) =======
  247. 90 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= =======
  248. 119 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  249. 119 =======
  250. 119 >>>>>>> 65f3409 (Featire specs) =======
  251. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= =======
  252. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= =======
  253. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= =======
  254. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= =======
  255. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= =======
  256. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= =======
  257. 119 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= =======
  258. 90 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= =======
  259. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= =======
  260. 119 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) phone { FFaker::PhoneNumberUA.home_phone_number }
  261. <<<<<<< HEAD
  262. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  263. 3 ======= <<<<<<< HEAD
  264. 92 =======
  265. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  266. 90 >>>>>>> 752f0c0 (Featire specs) =======
  267. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  268. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  269. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  270. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs)
  271. 119 =======
  272. 90 >>>>>>> d0dc1f1 (Featire specs) =======
  273. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> c1749d5 (Featire specs) ======= =======
  274. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 1cb2e82 (Featire specs) ======= =======
  275. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8577deb (Featire specs) ======= =======
  276. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> ebe5361 (Featire specs) ======= =======
  277. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) =======
  278. 119 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) =======
  279. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  280. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  281. 109 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs)
  282. 109 =======
  283. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  284. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= =======
  285. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  286. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  287. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) =======
  288. 1 >>>>>>> bf554f4 (Rebased) =======
  289. 111 >>>>>>> a5d032d (Fix) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs)
  290. 111 =======
  291. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= =======
  292. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= =======
  293. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= =======
  294. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
  295. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= =======
  296. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) =======
  297. 119 >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  298. 119 =======
  299. 119 >>>>>>> 65f3409 (Featire specs) =======
  300. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) ======= =======
  301. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) ======= =======
  302. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) ======= =======
  303. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) ======= =======
  304. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) ======= =======
  305. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) =======
  306. 119 >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) ======= quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 7c4ea7f (Fix) ======= quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 8f1bc14 (Fix) ======= quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  307. >>>>>>> 3dc272d (Featire specs)
  308. 1 transient do
  309. 1 categories_count { 1 }
  310. end
  311. 1 transient do
  312. 1 authors_count { 1 }
  313. end
  314. 1 after :create do |book, authors_count|
  315. 118 book.authors do
  316. Array.new(authors_count) do
  317. association(:book, authors: [instance])
  318. end
  319. end
  320. end
  321. 1 after :create do |book, categories_count|
  322. 118 book.categories do
  323. Array.new(categories_count) do
  324. association(:book, categories: [instance])
  325. end
  326. end
  327. end
  328. end
  329. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  330. =======
  331. >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs)
  332. =======
  333. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= =======
  334. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= =======
  335. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= =======
  336. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= =======
  337. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) =======
  338. >>>>>>> bebaea7 (Rebased) =======
  339. =======
  340. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= =======
  341. >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= =======
  342. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= =======
  343. >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= =======
  344. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= =======
  345. >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) =======
  346. >>>>>>> 1a9aba9 (Fix) =======
  347. =======
  348. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= =======
  349. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= =======
  350. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= =======
  351. >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= =======
  352. >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= =======
  353. >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) =======
  354. >>>>>>> 49e3b70 (Fix) =======
  355. =======
  356. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= =======
  357. >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= =======
  358. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= =======
  359. >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= =======
  360. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= =======
  361. >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) =======
  362. >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

spec/factories/books.rb

80.95% lines covered

21 relevant lines. 17 lines covered and 4 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 ======= >>>>>>> cde4834 (Manifest_cache true) factory :book do
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 95 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
  5. 3 ======= <<<<<<< HEAD
  6. 82 =======
  7. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  8. 80 >>>>>>> 752f0c0 (Featire specs) =======
  9. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  10. 80 >>>>>>> 4e81ea2 (Featire specs) =======
  11. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  12. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  13. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  14. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) =======
  15. 95 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  16. 95 =======
  17. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= =======
  18. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 5be567f (Featire specs) ======= =======
  19. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= =======
  20. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= =======
  21. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) =======
  22. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) =======
  23. 97 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs)
  24. 97 =======
  25. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= =======
  26. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= =======
  27. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= =======
  28. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= =======
  29. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= =======
  30. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 0b5b269 (Fix) =======
  31. 105 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  32. 105 =======
  33. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= =======
  34. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= =======
  35. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= =======
  36. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= =======
  37. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= =======
  38. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= =======
  39. 105 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  40. 3 >>>>>>> cde4834 (Manifest_cache true) title { FFaker::Book.title }
  41. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  42. 109 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
  43. 3 ======= <<<<<<< HEAD
  44. 92 =======
  45. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  46. 90 >>>>>>> 752f0c0 (Featire specs) =======
  47. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  48. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  49. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  50. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  51. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  52. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) =======
  53. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  54. 109 =======
  55. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= =======
  56. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 5be567f (Featire specs) ======= =======
  57. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= =======
  58. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= =======
  59. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) =======
  60. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) =======
  61. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs)
  62. 111 =======
  63. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= =======
  64. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= =======
  65. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= =======
  66. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= =======
  67. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= =======
  68. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 0b5b269 (Fix) =======
  69. 119 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  70. 119 =======
  71. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= =======
  72. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= =======
  73. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= =======
  74. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= =======
  75. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= =======
  76. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= =======
  77. 119 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  78. 3 >>>>>>> cde4834 (Manifest_cache true) description { FFaker::Book.description }
  79. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  80. 92 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
  81. 3 ======= <<<<<<< HEAD
  82. 82 =======
  83. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  84. 80 >>>>>>> 752f0c0 (Featire specs) =======
  85. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  86. 80 >>>>>>> 4e81ea2 (Featire specs) =======
  87. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  88. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  89. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  90. 82 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) =======
  91. 92 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  92. 92 =======
  93. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= =======
  94. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 5be567f (Featire specs) ======= =======
  95. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= =======
  96. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= =======
  97. 80 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) =======
  98. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) =======
  99. 94 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs)
  100. 94 =======
  101. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= =======
  102. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= =======
  103. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= =======
  104. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= =======
  105. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= =======
  106. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 0b5b269 (Fix) =======
  107. 98 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  108. 98 =======
  109. 80 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= =======
  110. 80 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= =======
  111. 80 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= =======
  112. 80 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= =======
  113. 80 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= =======
  114. 80 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= =======
  115. 98 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  116. 3 >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD price_cents { FFaker::Number.rand(10_000) } ======= price { FFaker::Number.rand(100) } >>>>>>> cde4834 (Manifest_cache true)
  117. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  118. 109 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
  119. 3 ======= <<<<<<< HEAD
  120. 92 =======
  121. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  122. 90 >>>>>>> 752f0c0 (Featire specs) =======
  123. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  124. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  125. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  126. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  127. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  128. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) =======
  129. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  130. 109 =======
  131. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= =======
  132. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 5be567f (Featire specs) ======= =======
  133. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= =======
  134. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= =======
  135. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) =======
  136. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) =======
  137. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs)
  138. 111 =======
  139. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= =======
  140. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= =======
  141. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= =======
  142. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= =======
  143. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= =======
  144. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 0b5b269 (Fix) =======
  145. 119 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  146. 119 =======
  147. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= =======
  148. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= =======
  149. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= =======
  150. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= =======
  151. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= =======
  152. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= =======
  153. 119 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  154. 3 >>>>>>> cde4834 (Manifest_cache true) materials { FFaker::Book.cover(:format) }
  155. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  156. 109 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
  157. 3 ======= <<<<<<< HEAD
  158. 92 =======
  159. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  160. 90 >>>>>>> 752f0c0 (Featire specs) =======
  161. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  162. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  163. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  164. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  165. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  166. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) =======
  167. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  168. 109 =======
  169. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= =======
  170. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 5be567f (Featire specs) ======= =======
  171. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= =======
  172. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= =======
  173. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) =======
  174. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) =======
  175. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs)
  176. 111 =======
  177. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= =======
  178. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= =======
  179. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= =======
  180. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= =======
  181. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= =======
  182. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 0b5b269 (Fix) =======
  183. 119 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  184. 119 =======
  185. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= =======
  186. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= =======
  187. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= =======
  188. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= =======
  189. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= =======
  190. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= =======
  191. 119 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  192. 3 >>>>>>> cde4834 (Manifest_cache true) year_of_publication { FFaker::Number.rand(1900..2022) }
  193. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  194. 109 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
  195. 3 ======= <<<<<<< HEAD
  196. 92 =======
  197. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  198. 90 >>>>>>> 752f0c0 (Featire specs) =======
  199. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  200. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  201. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  202. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  203. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  204. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) =======
  205. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  206. 109 =======
  207. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= =======
  208. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 5be567f (Featire specs) ======= =======
  209. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= =======
  210. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= =======
  211. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) =======
  212. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) =======
  213. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs)
  214. 111 =======
  215. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= =======
  216. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= =======
  217. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= =======
  218. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= =======
  219. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= =======
  220. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 0b5b269 (Fix) =======
  221. 119 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  222. 119 =======
  223. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= =======
  224. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= =======
  225. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= =======
  226. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= =======
  227. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= =======
  228. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= =======
  229. 119 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  230. 3 >>>>>>> cde4834 (Manifest_cache true) dimensions { FFaker::Book.cover(:size) }
  231. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  232. 109 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price)
  233. 3 ======= <<<<<<< HEAD
  234. 92 =======
  235. 3 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  236. 90 >>>>>>> 752f0c0 (Featire specs) =======
  237. 3 >>>>>>> bd8bda4 (Manifest_cache true) =======
  238. 90 >>>>>>> 4e81ea2 (Featire specs) =======
  239. 3 >>>>>>> aa7b40c (Manifest_cache true) =======
  240. 90 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) =======
  241. 3 >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD quantity { FFaker::Number.rand(2..10) } ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) =======
  242. 3 >>>>>>> 183b6c5 (Manifest_cache true) =======
  243. 92 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) =======
  244. 109 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs)
  245. 109 =======
  246. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) >>>>>>> a636fda (Featire specs) ======= =======
  247. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= =======
  248. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= =======
  249. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= =======
  250. 90 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) =======
  251. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> d15fe1d (Fix) =======
  252. 111 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs)
  253. 111 =======
  254. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 9620751 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= =======
  255. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= =======
  256. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= =======
  257. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= =======
  258. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= =======
  259. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 0b5b269 (Fix) =======
  260. 119 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs)
  261. 119 =======
  262. 90 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= =======
  263. 90 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= =======
  264. 90 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= =======
  265. 90 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= =======
  266. 90 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= =======
  267. 90 >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= =======
  268. 119 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) quantity { FFaker::Number.rand(0..10) } ======= <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> 27e3351 (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= quantity { FFaker::Number.rand(2..10) } ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= quantity { FFaker::Number.rand(2..10) } >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) ======= quantity { FFaker::Number.rand(0..10) } >>>>>>> cde4834 (Manifest_cache true)
  269. <<<<<<< HEAD
  270. 1 transient do
  271. 1 categories_count { 1 }
  272. end
  273. 1 transient do
  274. 1 authors_count { 1 }
  275. end
  276. 1 after :create do |book, authors_count|
  277. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  278. 110 =======
  279. 108 >>>>>>> ee78f39 (Rebased) =======
  280. >>>>>>> 49e8a6c (Rebased) =======
  281. 110 >>>>>>> 872e675 (Fix) =======
  282. 118 >>>>>>> 1d59aaa (Fix) =======
  283. 108 >>>>>>> 836a973 (Rebased) =======
  284. >>>>>>> 078304c (Rebased) =======
  285. 110 >>>>>>> d15fe1d (Fix) =======
  286. 118 >>>>>>> 0b5b269 (Fix) book.authors do
  287. Array.new(authors_count) do
  288. association(:book, authors: [instance])
  289. end
  290. end
  291. end
  292. 1 after :create do |book, categories_count|
  293. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  294. 110 =======
  295. 108 >>>>>>> ee78f39 (Rebased) =======
  296. >>>>>>> 49e8a6c (Rebased) =======
  297. 110 >>>>>>> 872e675 (Fix) =======
  298. 118 >>>>>>> 1d59aaa (Fix) =======
  299. 108 >>>>>>> 836a973 (Rebased) =======
  300. >>>>>>> 078304c (Rebased) =======
  301. 110 >>>>>>> d15fe1d (Fix) =======
  302. 118 >>>>>>> 0b5b269 (Fix) book.categories do
  303. Array.new(categories_count) do
  304. association(:book, categories: [instance])
  305. end
  306. end
  307. end
  308. ======= >>>>>>> cde4834 (Manifest_cache true) end
  309. <<<<<<< HEAD
  310. =======
  311. >>>>>>> cde4834 (Manifest_cache true) end
<<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs)

spec/factories/books_categories.rb

=======

spec/factories/books_category.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) =======

spec/factories/books_categories.rb

>>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) =======

spec/factories/books_category.rb

>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) =======

spec/factories/books_category.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) =======

spec/factories/books_category.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) =======

spec/factories/books_category.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) =======

spec/factories/books_categories.rb

>>>>>>> bebaea7 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======

spec/factories/books_category.rb

>>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) =======

spec/factories/books_categories.rb

>>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) =======

spec/factories/books_categories.rb

>>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======

spec/factories/books_categories.rb

>>>>>>> 20094c5 (After billing and shipping change redirect to prev path)

100.0% lines covered

4 relevant lines. 4 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :books_category do
  3. 1 book
  4. 1 category
  5. end
  6. end

spec/factories/categories.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :category do
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 12 ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 113da87 (Featire specs) =======
  5. 12 >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= <<<<<<< HEAD =======
  6. 12 >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1d59aaa (Fix) <<<<<<< HEAD ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price)
  7. 12 >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  8. 1 ======= <<<<<<< HEAD
  9. 8 =======
  10. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  11. 8 >>>>>>> 752f0c0 (Featire specs) =======
  12. 1 >>>>>>> bd8bda4 (Manifest_cache true) =======
  13. 8 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) =======
  14. 1 >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  15. 8 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) =======
  16. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) =======
  17. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  18. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) =======
  19. 1 >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) =======
  20. 8 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======
  21. 12 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true)
  22. 12 ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true)
  23. 12 >>>>>>> 9620751 (Featire specs) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true)
  24. 12 >>>>>>> 2a25e4c (Featire specs) =======
  25. 12 >>>>>>> 9620751 (Featire specs) =======
  26. 12 >>>>>>> 9dc109d (Featire specs) ======= =======
  27. 12 >>>>>>> 8c32a77 (Featire specs) =======
  28. 12 >>>>>>> 9620751 (Featire specs) =======
  29. 12 >>>>>>> 9dc109d (Featire specs) =======
  30. 12 >>>>>>> 65f3409 (Featire specs) =======
  31. 8 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) =======
  32. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) =======
  33. 8 =======
  34. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  35. 8 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
  36. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  37. 8 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
  38. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  39. 8 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) =======
  40. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) =======
  41. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  42. 8 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  43. 1 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= =======
  44. 8 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  45. 12 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> e991554 (Manifest_cache true) =======
  46. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) =======
  47. 8 =======
  48. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  49. 8 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) =======
  50. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  51. 8 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) =======
  52. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======
  53. 8 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  54. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= =======
  55. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  56. 8 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 9d9ff14 (Manifest_cache true) =======
  57. 1 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) =======
  58. 8 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  59. 12 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= =======
  60. 12 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) =======
  61. 1 >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 866aee4 (Manifest_cache true) =======
  62. 1 >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) =======
  63. 8 =======
  64. 1 >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  65. 8 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) =======
  66. 1 >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  67. 8 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) =======
  68. 1 >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  69. 8 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  70. 1 >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  71. 12 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  72. 8 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) =======
  73. 1 >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD
  74. 8 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  75. 12 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) =======
  76. 12 >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= =======
  77. 12 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) name { FFaker::Book.genre }
  78. end
  79. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> e031bce (Manifest_cache true) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> 02ba384 (Manifest_cache true) ======= >>>>>>> 264ef06 (Add login registration pages) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> a1a8477 (Add login registration pages) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> d52ad35 (Rebased) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased)
======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> e50f73e (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
=======
>>>>>>> 7c4ea7f (Fix) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix)
>>>>>>> 7c4ea7f (Fix) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> cacbab9 (Add login registration pages) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> f182ac7 (Add login registration pages) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 57da3ff (Add login registration pages) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> a624084 (Add login registration pages) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6a9fede (Add login registration pages)
======= ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 0005d4a (Add login registration pages) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 58d403b (Add login registration pages) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> b575a28 (Add login registration pages) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 5caffae (Add login registration pages) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> fb10fe4 (Add login registration pages) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> 69eb97e (Add login registration pages) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> 089f8cf (Add login registration pages) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0edd9b7 (Add login registration pages) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
>>>>>>> 7c4ea7f (Fix)

spec/factories/coupons.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :coupon do
  3. 4 code { SecureRandom.hex }
  4. 4 is_active { true }
  5. 4 active_till_date { FFaker::Time.datetime }
  6. 1 discount { rand(0.0..1.0) }
  7. end
  8. end

spec/factories/credit_cards.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :credit_card do
  3. 1 user { user }
  4. 1 code { FFaker::Finance.credit_card }
  5. 1 name { FFaker::Lorem.word }
  6. 1 cvv { rand(0...10).to_s * 3 }
  7. 1 expiration_date { (Time.zone.now + rand(1..10).year * rand(0..1)).strftime('%m/%y') }
  8. end
  9. end

spec/factories/deliveries.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :delivery do
  3. 5 price_cents { rand(0...10_000) }
  4. 5 delivery_method { FFaker::Lorem.word }
  5. 5 delivery_day { rand(1..5) }
  6. end
  7. end

spec/factories/order_books.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :order_book do
  3. 1 order
  4. 1 book
  5. 5 quantity { 1 }
  6. end
  7. end

spec/factories/orders.rb

80.0% lines covered

10 relevant lines. 8 lines covered and 2 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :order do
  3. 5 status { 'initialized' }
  4. 1 delivery
  5. 1 transient do
  6. 1 books_count { 1 }
  7. end
  8. 1 after :create do |order, books_count|
  9. 4 order.books do
  10. Array.new(books_count) do
  11. association(:order, books: [instance])
  12. end
  13. end
  14. end
  15. end
  16. end

spec/factories/reviews.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :review do
  3. 1 title { FFaker::Lorem.words(5) }
  4. 1 rating { FFaker::Number.rand(0..5) }
  5. 1 body { FFaker::Lorem.words(500) }
  6. end
  7. end

spec/factories/shippings.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :shipping do
  3. 1 user
  4. 1 address { FFaker::AddressUA.street_address }
  5. 1 city { FFaker::AddressUA.city }
  6. 1 zip { FFaker::AddressUA.zip_code }
  7. 1 country { FFaker::AddressUA.country }
  8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
  9. end
  10. end
>>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased)

spec/factories/users.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :user do
  3. 20 email { FFaker::Internet.email }
  4. 27 password { 'password' }
  5. 27 confirmed_at { Time.zone.now }
  6. end
  7. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD >>>>>>> 3dc272d (Featire specs)

spec/factories/coupons.rb

======= =======
>>>>>>> c033601 (Rebased)

spec/feature/admin/author_spec.rb

>>>>>>> 1577aeb (Rebased)

100.0% lines covered

<<<<<<< HEAD 6 relevant lines. 6 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> 1577aeb (Rebased) 0 lines missed.
    
  1. 1 <<<<<<< HEAD FactoryBot.define do ======= RSpec.describe 'Author' do >>>>>>> 1577aeb (Rebased)
  2. 1 <<<<<<< HEAD factory :coupon do
  3. 4 code { SecureRandom.hex }
  4. 4 is_active { true }
  5. 4 active_till_date { FFaker::Time.datetime }
  6. 1 discount { rand(0.0..5.0) }
  7. ======= >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD end
  8. end

spec/factories/order_books.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :order_book do ======= include_context 'with api request authentication helper methods' >>>>>>> 1577aeb (Rebased)
  3. 1 <<<<<<< HEAD order ======= include_context 'with api request global before and after hooks' >>>>>>> 1577aeb (Rebased)
  4. <<<<<<< HEAD
  5. =======
  6. 2 let(:first_name) { FFaker::Name.first_name }
  7. 2 let(:last_name) { FFaker::Name.last_name }
  8. 2 let(:new_name) { FFaker::Name.first_name }
  9. 2 let(:old_name) { author.first_name }
  10. 4 let(:author) { create(:author) }
  11. >>>>>>> 1577aeb (Rebased) 1 <<<<<<< HEAD book ======= before do
  12. 4 sign_in(create(:admin_user), :admin_user)
  13. end
  14. 1 it 'can create an author' do
  15. 1 visit 'admin/authors'
  16. 1 click_link('New Author')
  17. 1 fill_in 'author[first_name]', with: first_name
  18. 1 fill_in 'author[last_name]', with: last_name
  19. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
  20. end
  21. 1 it 'can delete an author' do
  22. 1 author
  23. 1 visit 'admin/authors'
  24. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
  25. end
  26. 1 it 'can view an author' do
  27. 1 author
  28. 1 visit 'admin/authors'
  29. 1 click_link('View')
  30. 1 expect(page).to have_content(author.first_name)
  31. end
  32. 1 it 'can edit an author' do
  33. 1 author
  34. 1 visit 'admin/authors'
  35. 1 click_link('Edit')
  36. 1 fill_in 'author[first_name]', with: new_name
  37. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
  38. end
  39. end

spec/feature/admin/book_spec.rb

100.0% lines covered

32 relevant lines. 32 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. >>>>>>> 1577aeb (Rebased)
  5. 5 <<<<<<< HEAD quantity { 1 }
  6. end
  7. end

spec/factories/orders.rb

77.78% lines covered

9 relevant lines. 7 lines covered and 2 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :order do
  3. 5 status { 'created' }
  4. 1 transient do
  5. 1 books_count { 1 }
  6. end
  7. 1 after :create do |order, books_count|
  8. 4 order.books do
  9. Array.new(books_count) do
  10. association(:order, books: [instance])
  11. end
  12. end
  13. end
  14. end
  15. end

spec/factories/reviews.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :review do
  3. 1 title { FFaker::Lorem.words(5) }
  4. 1 rating { FFaker::Number.rand(0..5) }
  5. 1 body { FFaker::Lorem.words(500) }
  6. end
  7. end

spec/factories/shippings.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :shipping do
  3. 1 user
  4. 1 address { FFaker::AddressUA.street_address }
  5. 1 city { FFaker::AddressUA.city }
  6. 1 zip { FFaker::AddressUA.zip_code }
  7. 1 country { FFaker::AddressUA.country }
  8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
  9. end
  10. end
>>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased)

spec/factories/users.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :user do
  3. 20 email { FFaker::Internet.email }
  4. 27 password { 'password' }
  5. 27 confirmed_at { Time.zone.now }
  6. end
  7. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD >>>>>>> 715fac2 (Featire specs)

spec/factories/coupons.rb

======= =======
>>>>>>> c033601 (Rebased)

spec/feature/admin/author_spec.rb

>>>>>>> 836a973 (Rebased)

100.0% lines covered

<<<<<<< HEAD 6 relevant lines. 6 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> 836a973 (Rebased) 0 lines missed.
    
  1. 1 <<<<<<< HEAD FactoryBot.define do ======= RSpec.describe 'Author' do >>>>>>> 836a973 (Rebased)
  2. 1 <<<<<<< HEAD factory :coupon do
  3. 4 code { SecureRandom.hex }
  4. 4 is_active { true }
  5. 4 active_till_date { FFaker::Time.datetime }
  6. 1 discount { rand(0..50) / 100 }
  7. ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD end
  8. end

spec/factories/order_books.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :order_book do ======= include_context 'with api request authentication helper methods' >>>>>>> 836a973 (Rebased)
  3. 1 <<<<<<< HEAD order ======= include_context 'with api request global before and after hooks' >>>>>>> 836a973 (Rebased)
  4. <<<<<<< HEAD
  5. =======
  6. 2 let(:first_name) { FFaker::Name.first_name }
  7. 2 let(:last_name) { FFaker::Name.last_name }
  8. 2 let(:new_name) { FFaker::Name.first_name }
  9. 2 let(:old_name) { author.first_name }
  10. 4 let(:author) { create(:author) }
  11. >>>>>>> 836a973 (Rebased) 1 <<<<<<< HEAD book ======= before do
  12. 4 sign_in(create(:admin_user), :admin_user)
  13. end
  14. 1 it 'can create an author' do
  15. 1 visit 'admin/authors'
  16. 1 click_link('New Author')
  17. 1 fill_in 'author[first_name]', with: first_name
  18. 1 fill_in 'author[last_name]', with: last_name
  19. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
  20. end
  21. 1 it 'can delete an author' do
  22. 1 author
  23. 1 visit 'admin/authors'
  24. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
  25. end
  26. 1 it 'can view an author' do
  27. 1 author
  28. 1 visit 'admin/authors'
  29. 1 click_link('View')
  30. 1 expect(page).to have_content(author.first_name)
  31. end
  32. 1 it 'can edit an author' do
  33. 1 author
  34. 1 visit 'admin/authors'
  35. 1 click_link('Edit')
  36. 1 fill_in 'author[first_name]', with: new_name
  37. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
  38. end
  39. end

spec/feature/admin/book_spec.rb

100.0% lines covered

32 relevant lines. 32 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. >>>>>>> 836a973 (Rebased)
  5. 5 <<<<<<< HEAD quantity { 1 }
  6. end
  7. end

spec/factories/orders.rb

77.78% lines covered

9 relevant lines. 7 lines covered and 2 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :order do
  3. 5 status { 'created' }
  4. 1 transient do
  5. 1 books_count { 1 }
  6. end
  7. 1 after :create do |order, books_count|
  8. 4 order.books do
  9. Array.new(books_count) do
  10. association(:order, books: [instance])
  11. end
  12. end
  13. end
  14. end
  15. end

spec/factories/reviews.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :review do
  3. 1 title { FFaker::Lorem.words(5) }
  4. 1 rating { FFaker::Number.rand(0..5) }
  5. 1 body { FFaker::Lorem.words(500) }
  6. end
  7. end

spec/factories/shippings.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :shipping do
  3. 1 user
  4. 1 address { FFaker::AddressUA.street_address }
  5. 1 city { FFaker::AddressUA.city }
  6. 1 zip { FFaker::AddressUA.zip_code }
  7. 1 country { FFaker::AddressUA.country }
  8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
  9. end
  10. end
>>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased)

spec/factories/users.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :user do
  3. 17 email { FFaker::Internet.email }
  4. 24 password { 'password' }
  5. 24 confirmed_at { Time.zone.now }
  6. end
  7. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD >>>>>>> df37394 (Featire specs)

spec/factories/reviews.rb

======= =======
>>>>>>> c033601 (Rebased)

spec/feature/admin/author_spec.rb

>>>>>>> ee78f39 (Rebased)

100.0% lines covered

<<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> ee78f39 (Rebased) 0 lines missed.
    
  1. 1 <<<<<<< HEAD FactoryBot.define do ======= RSpec.describe 'Author' do >>>>>>> ee78f39 (Rebased)
  2. 1 <<<<<<< HEAD factory :review do ======= include_context 'with api request authentication helper methods' >>>>>>> ee78f39 (Rebased)
  3. 1 <<<<<<< HEAD title { FFaker::Lorem.words(5) } ======= include_context 'with api request global before and after hooks' >>>>>>> ee78f39 (Rebased)
  4. <<<<<<< HEAD
  5. 1 =======
  6. 2 let(:first_name) { FFaker::Name.first_name }
  7. 2 let(:last_name) { FFaker::Name.last_name }
  8. 2 let(:new_name) { FFaker::Name.first_name }
  9. 2 let(:old_name) { author.first_name }
  10. 4 let(:author) { create(:author) }
  11. 1 before do
  12. 4 sign_in(create(:admin_user), :admin_user)
  13. end
  14. 1 it 'can create an author' do
  15. 1 visit 'admin/authors'
  16. 1 click_link('New Author')
  17. 1 fill_in 'author[first_name]', with: first_name
  18. 1 fill_in 'author[last_name]', with: last_name
  19. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
  20. end
  21. 1 it 'can delete an author' do
  22. 1 author
  23. 1 visit 'admin/authors'
  24. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
  25. end
  26. 1 it 'can view an author' do
  27. 1 author
  28. 1 visit 'admin/authors'
  29. 1 click_link('View')
  30. 1 expect(page).to have_content(author.first_name)
  31. end
  32. 1 it 'can edit an author' do
  33. 1 author
  34. 1 visit 'admin/authors'
  35. 1 click_link('Edit')
  36. 1 fill_in 'author[first_name]', with: new_name
  37. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
  38. end
  39. end

spec/feature/admin/book_spec.rb

100.0% lines covered

32 relevant lines. 32 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. =======
  5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  6. >>>>>>> 752f0c0 (Featire specs) =======
  7. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  8. >>>>>>> 08edf50 (Featire specs) =======
  9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  10. >>>>>>> 7a02bbe (Featire specs) =======
  11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  12. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= =======
  13. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  14. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  15. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  16. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  17. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 5 >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD rating { FFaker::Number.rand(0..5) }
  18. 1 body { FFaker::Lorem.words(500) }
  19. end
  20. end

spec/factories/shippings.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :shipping do
  3. 1 user
  4. 1 address { FFaker::AddressUA.street_address }
  5. 1 city { FFaker::AddressUA.city }
  6. 1 zip { FFaker::AddressUA.zip_code }
  7. 1 country { FFaker::AddressUA.country }
  8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
  9. end
  10. end
>>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased)

spec/factories/users.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :user do
  3. 13 email { FFaker::Internet.email }
  4. 20 password { 'password' }
  5. 20 confirmed_at { Time.zone.now }
  6. end
  7. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages)
<<<<<<< HEAD >>>>>>> d96cf3b (Featire specs)

spec/factories/reviews.rb

======= =======
>>>>>>> c033601 (Rebased)

spec/feature/admin/author_spec.rb

>>>>>>> d780a52 (Rebased)

100.0% lines covered

<<<<<<< HEAD 5 relevant lines. 5 lines covered and ======= 31 relevant lines. 31 lines covered and >>>>>>> d780a52 (Rebased) 0 lines missed.
    
  1. 1 <<<<<<< HEAD FactoryBot.define do ======= RSpec.describe 'Author' do >>>>>>> d780a52 (Rebased)
  2. 1 <<<<<<< HEAD factory :review do ======= include_context 'with api request authentication helper methods' >>>>>>> d780a52 (Rebased)
  3. 1 <<<<<<< HEAD title { FFaker::Lorem.words(5) } ======= include_context 'with api request global before and after hooks' >>>>>>> d780a52 (Rebased)
  4. <<<<<<< HEAD
  5. 1 rating { FFaker::Number.rand(0..5) }
  6. 1 body { FFaker::Lorem.words(500) }
  7. end
  8. end

spec/factories/shippings.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :shipping do
  3. 1 user
  4. 1 address { FFaker::AddressUA.street_address }
  5. 1 city { FFaker::AddressUA.city }
  6. 1 zip { FFaker::AddressUA.zip_code }
  7. 1 country { FFaker::AddressUA.country }
  8. 1 phone { FFaker::PhoneNumberUA.home_phone_number }
  9. end
  10. end
>>>>>>> aca90e3 (Rebased)

spec/factories/users.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 FactoryBot.define do
  2. 1 factory :user do
  3. 13 email { FFaker::Internet.email }
  4. 20 password { 'password' }
  5. 20 confirmed_at { Time.zone.now }
  6. end
  7. end
<<<<<<< HEAD >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price)
=======
>>>>>>> aca90e3 (Rebased)

spec/feature/admin/author_spec.rb

=======

spec/feature/admin/author_spec.rb

=======

spec/feature/admin/author_spec.rb

=======

spec/feature/admin/author_spec.rb

=======

spec/feature/admin/author_spec.rb

100.0% lines covered

31 relevant lines. 31 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Author' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. ======= >>>>>>> d780a52 (Rebased)
  5. 2 let(:first_name) { FFaker::Name.first_name }
  6. 2 let(:last_name) { FFaker::Name.last_name }
  7. 2 let(:new_name) { FFaker::Name.first_name }
  8. 2 let(:old_name) { author.first_name }
  9. 4 let(:author) { create(:author) }
  10. 1 before do
  11. 4 sign_in(create(:admin_user), :admin_user)
  12. end
  13. 1 it 'can create an author' do
  14. 1 visit 'admin/authors'
  15. 1 click_link('New Author')
  16. 1 fill_in 'author[first_name]', with: first_name
  17. 1 fill_in 'author[last_name]', with: last_name
  18. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
  19. end
  20. 1 it 'can delete an author' do
  21. 1 author
  22. 1 visit 'admin/authors'
  23. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
  24. end
  25. 1 it 'can view an author' do
  26. 1 author
  27. 1 visit 'admin/authors'
  28. 1 click_link('View')
  29. 1 expect(page).to have_content(author.first_name)
  30. end
  31. 1 it 'can edit an author' do
  32. 1 author
  33. 1 visit 'admin/authors'
  34. 1 click_link('Edit')
  35. 1 fill_in 'author[first_name]', with: new_name
  36. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
  37. end
  38. end

spec/feature/admin/book_spec.rb

100.0% lines covered

43 relevant lines. 43 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 7 ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) let(:book) { create(:book) } ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= let(:book) { create(:book) } ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) let(:category_one) { FactoryBot.create(:category) }
  5. 3 let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= let(:book) { create(:book) } >>>>>>> 836a973 (Rebased) ======= let(:book) { create(:book) } >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  6. 1 let(:params) do
  7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  8. 1 =======
  9. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56ef3ac (Featire specs) =======
  10. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 113da87 (Featire specs) =======
  11. 4 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8b420cf (Featire specs) =======
  12. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) =======
  13. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 20256f8 (Featire specs) =======
  14. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) =======
  15. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  16. 1 >>>>>>> 836a973 (Rebased) =======
  17. 1 >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) { title: FFaker::Book.title,
  18. description: FFaker::Book.description,
  19. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 08edf50 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= price_cents: FFaker::Number.rand(1..100), >>>>>>> 836a973 (Rebased) ======= price_cents: FFaker::Number.rand(1..100), >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  20. dimensions: FFaker::Book.cover,
  21. year_of_publication: FFaker::Number.rand(1900..2022),
  22. materials: 'Soft cover',
  23. quantity: FFaker::Number.rand(2..5) }
  24. end
  25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  26. 1 before do
  27. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  28. 6 =======
  29. 4 >>>>>>> ee78f39 (Rebased) =======
  30. 4 >>>>>>> 836a973 (Rebased) =======
  31. 4 >>>>>>> 1577aeb (Rebased) sign_in(create(:admin_user), :admin_user)
  32. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  33. 6 =======
  34. 4 >>>>>>> ee78f39 (Rebased) =======
  35. 4 >>>>>>> 836a973 (Rebased) =======
  36. 4 >>>>>>> 1577aeb (Rebased) book
  37. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  38. 6 =======
  39. 4 >>>>>>> ee78f39 (Rebased) =======
  40. 4 >>>>>>> 836a973 (Rebased) =======
  41. 4 >>>>>>> 1577aeb (Rebased) visit 'admin/books'
  42. end
  43. 1 it 'can create an category' do
  44. 1 click_link('New Book')
  45. 1 fill_in 'book[title]', with: params[:title]
  46. 1 fill_in 'book[description]', with: params[:description]
  47. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication] <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased)
  48. 1 fill_in 'book[price_cents]', with: params[:price_cents]
  49. 1 fill_in 'book[materials]', with: params[:materials]
  50. 1 fill_in 'book[dimensions]', with: params[:dimensions]
  51. 1 fill_in 'book[quantity]', with: params[:quantity]
  52. 1 click_button('Create Book')
  53. 1 expect(page).to have_content(params[:title])
  54. end
  55. 1 it 'can delete an book' do
  56. 1 click_link('Delete')
  57. 1 expect(page).not_to have_content(book.title)
  58. end
  59. 1 it 'can view an book' do
  60. 1 click_link('View')
  61. 1 expect(page).to have_content(book.title)
  62. end
  63. 1 it 'can edit an book' do
  64. 1 click_link('Edit')
  65. 1 fill_in 'book[title]', with: 'New title'
  66. 1 click_button('Update Book')
  67. 1 expect(page).to have_content('New title')
  68. end
  69. <<<<<<< HEAD <<<<<<< HEAD
  70. 1 context 'when image' do
  71. 1 before do
  72. 2 click_link('Edit')
  73. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
  74. 2 click_on 'Update Book'
  75. end
  76. 1 it 'can add images to book' do
  77. 1 expect(book.reload.images.count).to eq(1)
  78. end
  79. 1 it 'can delete images from book' do
  80. 1 click_link('Edit')
  81. 1 click_link('Delete')
  82. 1 expect(book.reload.images.count).to eq(0)
  83. end
  84. end
  85. ======= >>>>>>> ee78f39 (Rebased) end

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Category' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:category_name) { FFaker::Book.genre }
  5. 5 let(:category) { create(:category) }
  6. 1 before do
  7. 4 sign_in(create(:admin_user), :admin_user)
  8. 4 category
  9. 4 visit 'admin/categories'
  10. =======
  11. 7 >>>>>>> d0dc1f1 (Featire specs) =======
  12. 7 >>>>>>> 752f0c0 (Featire specs) =======
  13. 7 >>>>>>> 4e81ea2 (Featire specs) =======
  14. 7 >>>>>>> 08edf50 (Featire specs) =======
  15. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  16. 7 >>>>>>> 7a02bbe (Featire specs) =======
  17. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 08edf50 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  18. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) ======= describe '#show book' do >>>>>>> 08edf50 (Featire specs) ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  19. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books info' do >>>>>>> 08edf50 (Featire specs) ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  21. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  22. 1 visit "books/#{book.id}"
  23. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  25. =======
  26. >>>>>>> d0dc1f1 (Featire specs) =======
  27. >>>>>>> 752f0c0 (Featire specs) =======
  28. >>>>>>> 4e81ea2 (Featire specs) =======
  29. >>>>>>> 08edf50 (Featire specs) =======
  30. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  31. >>>>>>> 7a02bbe (Featire specs) =======
  32. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 08edf50 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  34. =======
  35. >>>>>>> d0dc1f1 (Featire specs) =======
  36. >>>>>>> 752f0c0 (Featire specs) =======
  37. >>>>>>> 4e81ea2 (Featire specs) =======
  38. >>>>>>> 08edf50 (Featire specs) =======
  39. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  40. >>>>>>> 7a02bbe (Featire specs) =======
  41. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  42. 1 click_button('Create Category') ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  43. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 08edf50 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  45. =======
  46. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  47. 1 >>>>>>> 752f0c0 (Featire specs) =======
  48. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  49. 1 >>>>>>> 08edf50 (Featire specs) =======
  50. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  51. 1 >>>>>>> 7a02bbe (Featire specs) =======
  52. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  53. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 08edf50 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  55. 1 click_link('Delete')
  56. =======
  57. >>>>>>> d0dc1f1 (Featire specs) =======
  58. >>>>>>> 752f0c0 (Featire specs) =======
  59. >>>>>>> 4e81ea2 (Featire specs) =======
  60. >>>>>>> 08edf50 (Featire specs) =======
  61. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  62. >>>>>>> 7a02bbe (Featire specs) =======
  63. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  65. =======
  66. >>>>>>> d0dc1f1 (Featire specs) =======
  67. >>>>>>> 752f0c0 (Featire specs) =======
  68. >>>>>>> 4e81ea2 (Featire specs) =======
  69. >>>>>>> 08edf50 (Featire specs) =======
  70. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  71. >>>>>>> 7a02bbe (Featire specs) =======
  72. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) expect(page).to have_content('Catalog') ======= >>>>>>> 836a973 (Rebased)
  73. 1 <<<<<<< HEAD end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= fill_in 'book[price_cents]', with: params[:price_cents] >>>>>>> 836a973 (Rebased)
  74. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= fill_in 'book[materials]', with: params[:materials] >>>>>>> 836a973 (Rebased)
  75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  76. =======
  77. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  78. 1 >>>>>>> 752f0c0 (Featire specs) =======
  79. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  80. 1 >>>>>>> 08edf50 (Featire specs) =======
  81. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  82. 1 >>>>>>> 7a02bbe (Featire specs) =======
  83. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when test read more' do >>>>>>> 08edf50 (Featire specs) ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= fill_in 'book[dimensions]', with: params[:dimensions] >>>>>>> 836a973 (Rebased)
  84. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show read more' do >>>>>>> 08edf50 (Featire specs) ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= fill_in 'book[quantity]', with: params[:quantity]
  85. 1 click_button('Create Book')
  86. 1 expect(page).to have_content(params[:title])
  87. end
  88. 1 it 'can delete an book' do
  89. 1 click_link('Delete')
  90. 1 expect(page).not_to have_content(book.title)
  91. end
  92. 1 it 'can view an book' do
  93. 1 click_link('View')
  94. 1 expect(page).to have_content(book.title)
  95. end
  96. 1 it 'can edit an book' do
  97. 1 click_link('Edit')
  98. 1 fill_in 'book[title]', with: 'New title'
  99. 1 click_button('Update Book')
  100. 1 expect(page).to have_content('New title')
  101. end
  102. ======= >>>>>>> 1577aeb (Rebased) end

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Category' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:category_name) { FFaker::Book.genre }
  5. 5 let(:category) { create(:category) }
  6. 1 before do
  7. 4 sign_in(create(:admin_user), :admin_user)
  8. 4 category
  9. 4 visit 'admin/categories'
  10. =======
  11. 7 >>>>>>> d0dc1f1 (Featire specs) =======
  12. 7 >>>>>>> 752f0c0 (Featire specs) =======
  13. 7 >>>>>>> 4e81ea2 (Featire specs) =======
  14. 7 >>>>>>> 08edf50 (Featire specs) =======
  15. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  16. 7 >>>>>>> 7a02bbe (Featire specs) =======
  17. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 08edf50 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  18. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) ======= describe '#show book' do >>>>>>> 08edf50 (Featire specs) ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  19. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books info' do >>>>>>> 08edf50 (Featire specs) ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  21. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  22. 1 visit "books/#{book.id}"
  23. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  25. =======
  26. >>>>>>> d0dc1f1 (Featire specs) =======
  27. >>>>>>> 752f0c0 (Featire specs) =======
  28. >>>>>>> 4e81ea2 (Featire specs) =======
  29. >>>>>>> 08edf50 (Featire specs) =======
  30. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  31. >>>>>>> 7a02bbe (Featire specs) =======
  32. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 08edf50 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  34. =======
  35. >>>>>>> d0dc1f1 (Featire specs) =======
  36. >>>>>>> 752f0c0 (Featire specs) =======
  37. >>>>>>> 4e81ea2 (Featire specs) =======
  38. >>>>>>> 08edf50 (Featire specs) =======
  39. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  40. >>>>>>> 7a02bbe (Featire specs) =======
  41. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  42. 1 click_button('Create Category') ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  43. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 08edf50 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  45. =======
  46. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  47. 1 >>>>>>> 752f0c0 (Featire specs) =======
  48. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  49. 1 >>>>>>> 08edf50 (Featire specs) =======
  50. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  51. 1 >>>>>>> 7a02bbe (Featire specs) =======
  52. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  53. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 08edf50 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  55. 1 click_link('Delete')
  56. =======
  57. >>>>>>> d0dc1f1 (Featire specs) =======
  58. >>>>>>> 752f0c0 (Featire specs) =======
  59. >>>>>>> 4e81ea2 (Featire specs) =======
  60. >>>>>>> 08edf50 (Featire specs) =======
  61. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  62. >>>>>>> 7a02bbe (Featire specs) =======
  63. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  65. =======
  66. >>>>>>> d0dc1f1 (Featire specs) =======
  67. >>>>>>> 752f0c0 (Featire specs) =======
  68. >>>>>>> 4e81ea2 (Featire specs) =======
  69. >>>>>>> 08edf50 (Featire specs) =======
  70. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  71. >>>>>>> 7a02bbe (Featire specs) =======
  72. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) expect(page).to have_content('Catalog')
  73. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  76. =======
  77. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  78. 1 >>>>>>> 752f0c0 (Featire specs) =======
  79. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  80. 1 >>>>>>> 08edf50 (Featire specs) =======
  81. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  82. 1 >>>>>>> 7a02bbe (Featire specs) =======
  83. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when test read more' do >>>>>>> 08edf50 (Featire specs) ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  84. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can view an category' do <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= it 'show read more' do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  85. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= click_link('View') >>>>>>> 836a973 (Rebased) ======= click_link('View') >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  86. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content('Read More') >>>>>>> 08edf50 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= expect(page).to have_content(category.name) >>>>>>> 836a973 (Rebased) ======= expect(page).to have_content(category.name) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= expect(page).to have_content('Read More') >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  87. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= end >>>>>>> 836a973 (Rebased) ======= end >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  88. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked read more', js: true do >>>>>>> 08edf50 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= it 'can edit an category' do >>>>>>> 836a973 (Rebased) ======= it 'can edit an category' do >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= it 'clicked read more', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  89. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= click_link('Edit') >>>>>>> 836a973 (Rebased) ======= click_link('Edit') >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  90. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= click_link 'Read More' >>>>>>> 08edf50 (Featire specs) ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= fill_in 'category[name]', with: 'New Genre' >>>>>>> 836a973 (Rebased) ======= fill_in 'category[name]', with: 'New Genre' >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= click_link 'Read More' >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  91. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content('Read More') >>>>>>> 08edf50 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= click_button('Update Category') >>>>>>> 836a973 (Rebased) ======= click_button('Update Category') >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  92. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  93. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  94. 1 =======
  95. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56ef3ac (Featire specs) =======
  96. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 113da87 (Featire specs) =======
  97. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8b420cf (Featire specs) =======
  98. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) =======
  99. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 20256f8 (Featire specs) =======
  100. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) =======
  101. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  102. 1 >>>>>>> 836a973 (Rebased) =======
  103. 1 >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= expect(page).to have_content('New Genre') >>>>>>> 836a973 (Rebased) ======= expect(page).to have_content('New Genre') >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= end >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= end >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  104. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end
  105. end

spec/feature/billing_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Billing', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  6. 2 let(:user) { create(:user) }
  7. 1 let(:attributes_for) { attributes_for(:billing) }
  8. 1 describe '#fill_in', js: true do
  9. 1 it 'fill in billing' do
  10. 1 sign_in(user)
  11. 1 visit edit_user_path(user.id)
  12. 1 within('div#billing.col-md-5.mb-40') do
  13. 1 find_all('div', class: 'form-group')[0] do
  14. fill_in :first_name, with: attributes_for[:first_name]
  15. end
  16. 1 find_all('div', class: 'form-group')[1] do
  17. fill_in :last_name, with: attributes_for[:last_name]
  18. end
  19. 1 find_all('div', class: 'form-group')[2] do
  20. fill_in :address, with: attributes_for[:address]
  21. end
  22. 1 find_all('div', class: 'form-group')[3] do
  23. fill_in :city, with: attributes_for[:city]
  24. end
  25. 1 find_all('div', class: 'form-group')[4] do
  26. fill_in :zip, with: attributes_for[:zip]
  27. end
  28. 1 find_all('div', class: 'form-group')[5] do
  29. fill_in :country, with: attributes_for[:country]
  30. end
  31. 1 find_all('div', class: 'form-group')[6] do
  32. fill_in :phone, with: attributes_for[:phone]
  33. end
  34. 1 click_on I18n.t('settings.save')
  35. end
  36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  37. end
  38. end
  39. end

spec/feature/book_spec.rb

100.0% lines covered

104 relevant lines. 104 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book', type: :feature do
  2. 5 let(:category_one) { create(:category) }
  3. 3 let(:category_two) { create(:category) }
  4. 1 let(:params) do
  5. 4 { title: FFaker::Book.title,
  6. description: FFaker::Book.description,
  7. price_cents: FFaker::Number.rand(1..100),
  8. dimensions: FFaker::Book.cover,
  9. year_of_publication: FFaker::Number.rand(1900..2022),
  10. materials: 'Soft cover',
  11. quantity: FFaker::Number.rand(2..5) }
  12. end
  13. 7 let(:book) { create(:book).decorate }
  14. 1 describe '#show book' do
  15. 1 it 'show books info' do
  16. 1 visit "books/#{book.id}"
  17. 1 expect(page).to have_content(book.title)
  18. end
  19. 1 it 'clicked Beck to results' do
  20. 1 visit "books/#{book.id}"
  21. 1 find('a', class: 'general-back-link').click
  22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
  23. end
  24. 1 context 'when test read more' do
  25. 1 it 'show read more' do
  26. 1 visit "books/#{book.id}"
  27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
  28. end
  29. 1 it 'clicked read more', js: true do
  30. 1 visit "books/#{book.id}"
  31. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link I18n.t('book_page.read_more') ======= click_link 'Read More' >>>>>>> ee78f39 (Rebased) ======= click_link 'Read More' >>>>>>> 836a973 (Rebased) ======= click_link 'Read More' >>>>>>> 1577aeb (Rebased)
  32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
  33. end
  34. end
  35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  36. >>>>>>> d0dc1f1 (Featire specs) =======
  37. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  38. >>>>>>> 4e81ea2 (Featire specs) =======
  39. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  40. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  41. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  42. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= =======
  43. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= =======
  44. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= =======
  45. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= =======
  46. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 context 'when quantity changes', js: true do
  47. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  48. =======
  49. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  50. >>>>>>> 752f0c0 (Featire specs) =======
  51. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  52. >>>>>>> 08edf50 (Featire specs) =======
  53. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  54. >>>>>>> 7a02bbe (Featire specs) =======
  55. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  56. >>>>>>> 836a973 (Rebased) =======
  57. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  58. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  59. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  60. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 before do
  61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  62. 2 visit "books/#{book.id}"
  63. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  64. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  65. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
  66. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  67. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  68. 1 =======
  69. =======
  70. >>>>>>> 1577aeb (Rebased) 2 >>>>>>> d0dc1f1 (Featire specs) =======
  71. 2 >>>>>>> 752f0c0 (Featire specs) =======
  72. 2 >>>>>>> 4e81ea2 (Featire specs) =======
  73. 2 >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  74. =======
  75. >>>>>>> 836a973 (Rebased) 2 ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  76. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
  77. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  78. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  79. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= =======
  80. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= =======
  81. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= =======
  82. 2 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= =======
  83. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  84. 2 >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) find('a', class: 'inc').click
  85. end
  86. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56ef3ac (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 113da87 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8b420cf (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  87. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  88. =======
  89. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  90. >>>>>>> 7a02bbe (Featire specs) =======
  91. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  92. >>>>>>> 836a973 (Rebased) =======
  93. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
  94. <<<<<<< HEAD <<<<<<< HEAD =======
  95. >>>>>>> d0dc1f1 (Featire specs) =======
  96. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  97. >>>>>>> 4e81ea2 (Featire specs) =======
  98. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) end
  99. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  100. =======
  101. >>>>>>> d0dc1f1 (Featire specs) =======
  102. >>>>>>> 752f0c0 (Featire specs) =======
  103. >>>>>>> 4e81ea2 (Featire specs) =======
  104. >>>>>>> 08edf50 (Featire specs) =======
  105. >>>>>>> 1577aeb (Rebased)
  106. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  107. =======
  108. >>>>>>> d0dc1f1 (Featire specs) =======
  109. >>>>>>> 752f0c0 (Featire specs) =======
  110. >>>>>>> 4e81ea2 (Featire specs) =======
  111. >>>>>>> 08edf50 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3dc272d (Featire specs) it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3dc272d (Featire specs) it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD it 'decrease quantity' do ======= ======= >>>>>>> 9c0d812 (Featire specs) it 'increase quantity' do >>>>>>> 20256f8 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs)
  112. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  113. =======
  114. >>>>>>> d0dc1f1 (Featire specs) =======
  115. >>>>>>> 752f0c0 (Featire specs) =======
  116. >>>>>>> 4e81ea2 (Featire specs) =======
  117. >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 20256f8 (Featire specs) <<<<<<< HEAD
  118. =======
  119. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  120. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price * 2}") ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) expect(page).to have_content("€#{Money.new(book.price_cents * 2)}") >>>>>>> 836a973 (Rebased)
  121. ======= =======
  122. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= =======
  123. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) end
  124. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  125. =======
  126. >>>>>>> d0dc1f1 (Featire specs) =======
  127. >>>>>>> 752f0c0 (Featire specs) =======
  128. >>>>>>> 4e81ea2 (Featire specs) =======
  129. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  130. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  131. =======
  132. >>>>>>> d0dc1f1 (Featire specs) =======
  133. >>>>>>> 752f0c0 (Featire specs) =======
  134. >>>>>>> 4e81ea2 (Featire specs) =======
  135. >>>>>>> 08edf50 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) it 'decrease quantity', js: true do ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased)
  136. 1 find('a', class: 'dec').click
  137. =======
  138. >>>>>>> 1577aeb (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= <<<<<<< HEAD ======= it 'decrease quantity' do >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs)
  139. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  140. =======
  141. >>>>>>> d0dc1f1 (Featire specs) =======
  142. >>>>>>> 752f0c0 (Featire specs) =======
  143. >>>>>>> 4e81ea2 (Featire specs) =======
  144. >>>>>>> 08edf50 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price * 2}")
  145. end
  146. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  147. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) it 'decrease quantity', js: true do ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  148. 1 find('a', class: 'dec').click
  149. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price}")
  150. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  151. end
  152. <<<<<<< HEAD end
  153. ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  154. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  155. ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  156. =======
  157. >>>>>>> 1577aeb (Rebased) end
  158. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= end
  159. ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  160. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  161. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  162. end
  163. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  164. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  165. 1 describe '#catalog' do
  166. 1 describe 'filter by category' do
  167. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  168. =======
  169. >>>>>>> 836a973 (Rebased) =======
  170. >>>>>>> 1577aeb (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD describe '#catalog' do
  171. 1 describe 'filter by category' do
  172. ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  173. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) describe '#catalog' do
  174. 1 describe 'filter by category' do
  175. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) before do
  176. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  177. =======
  178. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  179. >>>>>>> 752f0c0 (Featire specs) =======
  180. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  181. >>>>>>> 08edf50 (Featire specs) =======
  182. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  183. >>>>>>> 7a02bbe (Featire specs) =======
  184. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  185. >>>>>>> 836a973 (Rebased) =======
  186. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  187. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  188. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  189. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 2 category_one.books.create(params)
  190. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  191. =======
  192. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  193. >>>>>>> 752f0c0 (Featire specs) =======
  194. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  195. >>>>>>> 08edf50 (Featire specs) =======
  196. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  197. >>>>>>> 7a02bbe (Featire specs) =======
  198. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  199. >>>>>>> 836a973 (Rebased) =======
  200. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  201. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  202. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  203. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 2 visit books_path
  204. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  205. =======
  206. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  207. >>>>>>> 752f0c0 (Featire specs) =======
  208. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  209. >>>>>>> 08edf50 (Featire specs) =======
  210. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  211. >>>>>>> 7a02bbe (Featire specs) =======
  212. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  213. >>>>>>> 836a973 (Rebased) =======
  214. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  215. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  216. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  217. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end
  218. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  219. =======
  220. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  221. >>>>>>> 752f0c0 (Featire specs) =======
  222. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  223. >>>>>>> 08edf50 (Featire specs) =======
  224. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  225. >>>>>>> 7a02bbe (Featire specs) =======
  226. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  227. >>>>>>> 836a973 (Rebased) =======
  228. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  229. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  230. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  231. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  232. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  233. =======
  234. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  235. >>>>>>> 752f0c0 (Featire specs) =======
  236. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  237. >>>>>>> 08edf50 (Featire specs) =======
  238. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  239. >>>>>>> 7a02bbe (Featire specs) =======
  240. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  241. >>>>>>> 836a973 (Rebased) =======
  242. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  243. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  244. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  245. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 after do
  246. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  247. =======
  248. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  249. >>>>>>> 752f0c0 (Featire specs) =======
  250. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  251. >>>>>>> 08edf50 (Featire specs) =======
  252. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  253. >>>>>>> 7a02bbe (Featire specs) =======
  254. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  255. >>>>>>> 836a973 (Rebased) =======
  256. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  257. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  258. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  259. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 2 category_one.destroy
  260. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  261. =======
  262. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  263. >>>>>>> 752f0c0 (Featire specs) =======
  264. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  265. >>>>>>> 08edf50 (Featire specs) =======
  266. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  267. >>>>>>> 7a02bbe (Featire specs) =======
  268. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  269. >>>>>>> 836a973 (Rebased) =======
  270. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  271. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  272. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  273. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end
  274. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  275. =======
  276. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  277. >>>>>>> 752f0c0 (Featire specs) =======
  278. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  279. >>>>>>> 08edf50 (Featire specs) =======
  280. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  281. >>>>>>> 7a02bbe (Featire specs) =======
  282. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  283. >>>>>>> 836a973 (Rebased) =======
  284. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  285. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  286. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  287. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  288. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  289. =======
  290. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  291. >>>>>>> 752f0c0 (Featire specs) =======
  292. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  293. >>>>>>> 08edf50 (Featire specs) =======
  294. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  295. >>>>>>> 7a02bbe (Featire specs) =======
  296. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  297. >>>>>>> 836a973 (Rebased) =======
  298. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  299. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  300. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  301. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 it 'show book count for category' do
  302. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  303. =======
  304. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  305. >>>>>>> 752f0c0 (Featire specs) =======
  306. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  307. >>>>>>> 08edf50 (Featire specs) =======
  308. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  309. >>>>>>> 7a02bbe (Featire specs) =======
  310. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  311. >>>>>>> 836a973 (Rebased) =======
  312. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  313. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  314. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  315. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_one.books.size)
  316. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  317. =======
  318. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  319. >>>>>>> 752f0c0 (Featire specs) =======
  320. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  321. >>>>>>> 08edf50 (Featire specs) =======
  322. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  323. >>>>>>> 7a02bbe (Featire specs) =======
  324. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  325. >>>>>>> 836a973 (Rebased) =======
  326. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  327. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  328. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  329. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end
  330. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  331. =======
  332. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  333. >>>>>>> 752f0c0 (Featire specs) =======
  334. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  335. >>>>>>> 08edf50 (Featire specs) =======
  336. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  337. >>>>>>> 7a02bbe (Featire specs) =======
  338. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  339. >>>>>>> 836a973 (Rebased) =======
  340. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  341. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  342. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  343. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  344. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  345. 1 it 'filter book by category' do
  346. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
  347. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  348. =======
  349. >>>>>>> 836a973 (Rebased) =======
  350. >>>>>>> 1577aeb (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD it 'filter book by category' do
  351. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
  352. ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  353. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) it 'filter book by category' do
  354. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
  355. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) click_on category_one.name
  356. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  357. =======
  358. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  359. >>>>>>> 752f0c0 (Featire specs) =======
  360. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  361. >>>>>>> 08edf50 (Featire specs) =======
  362. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  363. >>>>>>> 7a02bbe (Featire specs) =======
  364. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  365. >>>>>>> 836a973 (Rebased) =======
  366. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  367. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  368. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  369. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end
  370. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  371. =======
  372. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  373. >>>>>>> 752f0c0 (Featire specs) =======
  374. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  375. >>>>>>> 08edf50 (Featire specs) =======
  376. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  377. >>>>>>> 7a02bbe (Featire specs) =======
  378. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  379. >>>>>>> 836a973 (Rebased) =======
  380. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  381. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  382. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  383. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  384. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  385. =======
  386. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  387. >>>>>>> 752f0c0 (Featire specs) =======
  388. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  389. >>>>>>> 08edf50 (Featire specs) =======
  390. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  391. >>>>>>> 7a02bbe (Featire specs) =======
  392. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  393. >>>>>>> 836a973 (Rebased) =======
  394. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  395. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  396. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  397. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_one.books.first.title)
  398. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  399. =======
  400. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  401. >>>>>>> 752f0c0 (Featire specs) =======
  402. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  403. >>>>>>> 08edf50 (Featire specs) =======
  404. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  405. >>>>>>> 7a02bbe (Featire specs) =======
  406. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  407. >>>>>>> 836a973 (Rebased) =======
  408. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  409. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  410. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  411. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end
  412. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  413. =======
  414. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  415. >>>>>>> 752f0c0 (Featire specs) =======
  416. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  417. >>>>>>> 08edf50 (Featire specs) =======
  418. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  419. >>>>>>> 7a02bbe (Featire specs) =======
  420. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  421. >>>>>>> 836a973 (Rebased) =======
  422. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  423. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  424. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  425. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end
  426. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  427. =======
  428. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  429. >>>>>>> 752f0c0 (Featire specs) =======
  430. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  431. >>>>>>> 08edf50 (Featire specs) =======
  432. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  433. >>>>>>> 7a02bbe (Featire specs) =======
  434. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  435. >>>>>>> 836a973 (Rebased) =======
  436. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  437. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  438. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  439. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  440. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  441. =======
  442. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  443. >>>>>>> 752f0c0 (Featire specs) =======
  444. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  445. >>>>>>> 08edf50 (Featire specs) =======
  446. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  447. >>>>>>> 7a02bbe (Featire specs) =======
  448. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  449. >>>>>>> 836a973 (Rebased) =======
  450. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  451. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  452. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  453. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 describe 'filter by all books' do
  454. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  455. =======
  456. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  457. >>>>>>> 752f0c0 (Featire specs) =======
  458. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  459. >>>>>>> 08edf50 (Featire specs) =======
  460. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  461. >>>>>>> 7a02bbe (Featire specs) =======
  462. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  463. >>>>>>> 836a973 (Rebased) =======
  464. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  465. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  466. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  467. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 before do
  468. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  469. =======
  470. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  471. >>>>>>> 752f0c0 (Featire specs) =======
  472. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  473. >>>>>>> 08edf50 (Featire specs) =======
  474. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  475. >>>>>>> 7a02bbe (Featire specs) =======
  476. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  477. >>>>>>> 836a973 (Rebased) =======
  478. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  479. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  480. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  481. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 2 category_one.books.create(params)
  482. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  483. 2 category_two.books.create(params)
  484. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  485. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) visit books_path ======= category_two.books.create(params) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) ======= category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= category_two.books.create(params) >>>>>>> 08edf50 (Featire specs) ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= visit books_path >>>>>>> 836a973 (Rebased) ======= visit books_path >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= category_two.books.create(params) >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  486. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) click_on I18n.t('catalog_page.all') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 08edf50 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 7a02bbe (Featire specs) ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= click_on I18n.t('catalog_page.all') >>>>>>> 836a973 (Rebased) ======= click_on I18n.t('catalog_page.all') >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= visit books_path >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  487. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  488. 2 click_on 'All'
  489. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end
  490. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  491. =======
  492. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  493. >>>>>>> 752f0c0 (Featire specs) =======
  494. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  495. >>>>>>> 08edf50 (Featire specs) =======
  496. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  497. >>>>>>> 7a02bbe (Featire specs) =======
  498. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  499. >>>>>>> 836a973 (Rebased) =======
  500. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  501. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  502. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  503. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  504. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  505. =======
  506. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  507. >>>>>>> 752f0c0 (Featire specs) =======
  508. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  509. >>>>>>> 08edf50 (Featire specs) =======
  510. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  511. >>>>>>> 7a02bbe (Featire specs) =======
  512. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  513. >>>>>>> 836a973 (Rebased) =======
  514. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  515. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  516. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  517. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 after do
  518. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  519. =======
  520. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  521. >>>>>>> 752f0c0 (Featire specs) =======
  522. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  523. >>>>>>> 08edf50 (Featire specs) =======
  524. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  525. >>>>>>> 7a02bbe (Featire specs) =======
  526. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  527. >>>>>>> 836a973 (Rebased) =======
  528. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  529. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  530. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  531. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 2 category_one.destroy
  532. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  533. =======
  534. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  535. >>>>>>> 752f0c0 (Featire specs) =======
  536. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  537. >>>>>>> 08edf50 (Featire specs) =======
  538. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  539. >>>>>>> 7a02bbe (Featire specs) =======
  540. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  541. >>>>>>> 836a973 (Rebased) =======
  542. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  543. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  544. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  545. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 2 category_two.destroy
  546. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  547. =======
  548. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  549. >>>>>>> 752f0c0 (Featire specs) =======
  550. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  551. >>>>>>> 08edf50 (Featire specs) =======
  552. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  553. >>>>>>> 7a02bbe (Featire specs) =======
  554. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  555. >>>>>>> 836a973 (Rebased) =======
  556. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  557. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  558. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  559. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end
  560. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  561. =======
  562. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  563. >>>>>>> 752f0c0 (Featire specs) =======
  564. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  565. >>>>>>> 08edf50 (Featire specs) =======
  566. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  567. >>>>>>> 7a02bbe (Featire specs) =======
  568. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  569. >>>>>>> 836a973 (Rebased) =======
  570. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  571. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  572. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  573. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  574. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  575. =======
  576. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  577. >>>>>>> 752f0c0 (Featire specs) =======
  578. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  579. >>>>>>> 08edf50 (Featire specs) =======
  580. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  581. >>>>>>> 7a02bbe (Featire specs) =======
  582. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  583. >>>>>>> 836a973 (Rebased) =======
  584. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  585. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  586. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  587. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 it 'shown books for first category' do
  588. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  589. =======
  590. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  591. >>>>>>> 752f0c0 (Featire specs) =======
  592. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  593. >>>>>>> 08edf50 (Featire specs) =======
  594. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  595. >>>>>>> 7a02bbe (Featire specs) =======
  596. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  597. >>>>>>> 836a973 (Rebased) =======
  598. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  599. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  600. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  601. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_one.books.first.title)
  602. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  603. =======
  604. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  605. >>>>>>> 752f0c0 (Featire specs) =======
  606. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  607. >>>>>>> 08edf50 (Featire specs) =======
  608. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  609. >>>>>>> 7a02bbe (Featire specs) =======
  610. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  611. >>>>>>> 836a973 (Rebased) =======
  612. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  613. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  614. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  615. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end
  616. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  617. =======
  618. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  619. >>>>>>> 752f0c0 (Featire specs) =======
  620. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  621. >>>>>>> 08edf50 (Featire specs) =======
  622. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  623. >>>>>>> 7a02bbe (Featire specs) =======
  624. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  625. >>>>>>> 836a973 (Rebased) =======
  626. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  627. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  628. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  629. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  630. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  631. =======
  632. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  633. >>>>>>> 752f0c0 (Featire specs) =======
  634. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  635. >>>>>>> 08edf50 (Featire specs) =======
  636. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  637. >>>>>>> 7a02bbe (Featire specs) =======
  638. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  639. >>>>>>> 836a973 (Rebased) =======
  640. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  641. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  642. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  643. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 it 'shown books for second category' do
  644. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  645. =======
  646. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  647. >>>>>>> 752f0c0 (Featire specs) =======
  648. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  649. >>>>>>> 08edf50 (Featire specs) =======
  650. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  651. >>>>>>> 7a02bbe (Featire specs) =======
  652. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  653. >>>>>>> 836a973 (Rebased) =======
  654. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  655. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  656. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  657. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_two.books.first.title)
  658. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  659. end
  660. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased) end
  661. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  662. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  663. ======= >>>>>>> 836a973 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD end
  664. ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  665. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  666. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  667. end
  668. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  669. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  670. =======
  671. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  672. >>>>>>> 752f0c0 (Featire specs) =======
  673. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  674. >>>>>>> 08edf50 (Featire specs) =======
  675. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  676. >>>>>>> 7a02bbe (Featire specs) =======
  677. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  678. >>>>>>> 836a973 (Rebased) =======
  679. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  680. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  681. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  682. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 describe 'load_more' do
  683. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  684. =======
  685. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  686. >>>>>>> 752f0c0 (Featire specs) =======
  687. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  688. >>>>>>> 08edf50 (Featire specs) =======
  689. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  690. >>>>>>> 7a02bbe (Featire specs) =======
  691. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  692. >>>>>>> 836a973 (Rebased) =======
  693. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  694. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  695. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  696. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 before do
  697. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  698. =======
  699. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  700. >>>>>>> 752f0c0 (Featire specs) =======
  701. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  702. >>>>>>> 08edf50 (Featire specs) =======
  703. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  704. >>>>>>> 7a02bbe (Featire specs) =======
  705. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  706. >>>>>>> 836a973 (Rebased) =======
  707. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  708. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  709. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  710. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= (BooksController::PAGINATION_PER_PAGE * 2).times do ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD ======= (BooksController::PAGINATION_PER_PAGE * 2).times do ======= >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 20256f8 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= 24.times do >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 20256f8 (Featire specs) ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= 24.times do >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= 24.times do >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  711. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  712. =======
  713. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  714. >>>>>>> 752f0c0 (Featire specs) =======
  715. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  716. >>>>>>> 08edf50 (Featire specs) =======
  717. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  718. >>>>>>> 7a02bbe (Featire specs) =======
  719. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  720. >>>>>>> 836a973 (Rebased) =======
  721. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  722. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  723. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  724. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 72 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) books << create(:book)
  725. end
  726. end ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= books << FactoryBot.create(:book) >>>>>>> 08edf50 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD
  727. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  728. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  729. 4 =======
  730. >>>>>>> d0dc1f1 (Featire specs) =======
  731. >>>>>>> 752f0c0 (Featire specs) =======
  732. >>>>>>> 4e81ea2 (Featire specs) =======
  733. >>>>>>> 08edf50 (Featire specs) =======
  734. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  735. >>>>>>> 7a02bbe (Featire specs) =======
  736. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  737. 4 let(:books) { [] } ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= books << FactoryBot.create(:book) >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  738. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  739. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  740. 4 =======
  741. >>>>>>> d0dc1f1 (Featire specs) =======
  742. >>>>>>> 752f0c0 (Featire specs) =======
  743. >>>>>>> 4e81ea2 (Featire specs) =======
  744. >>>>>>> 08edf50 (Featire specs) =======
  745. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  746. >>>>>>> 7a02bbe (Featire specs) =======
  747. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  748. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  749. 1 =======
  750. 4 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56ef3ac (Featire specs) =======
  751. 4 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 113da87 (Featire specs) =======
  752. 4 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8b420cf (Featire specs) =======
  753. 4 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) =======
  754. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 20256f8 (Featire specs) =======
  755. 4 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) =======
  756. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) ======= let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) ======= let(:books) { [] } >>>>>>> 08edf50 (Featire specs) ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  757. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  758. 1 visit books_path
  759. =======
  760. >>>>>>> d0dc1f1 (Featire specs) =======
  761. >>>>>>> 752f0c0 (Featire specs) =======
  762. >>>>>>> 4e81ea2 (Featire specs) =======
  763. >>>>>>> 08edf50 (Featire specs) =======
  764. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  765. >>>>>>> 7a02bbe (Featire specs) =======
  766. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  767. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  768. =======
  769. >>>>>>> 836a973 (Rebased) =======
  770. >>>>>>> 1577aeb (Rebased) 1 ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) ======= let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) ======= let(:books) { [] } >>>>>>> 08edf50 (Featire specs) ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  771. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  772. ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  773. >>>>>>> 836a973 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  774. =======
  775. >>>>>>> 1577aeb (Rebased) 1 find('a', id: 'view_more', class: 'view_more').click
  776. =======
  777. >>>>>>> d0dc1f1 (Featire specs) =======
  778. >>>>>>> 752f0c0 (Featire specs) =======
  779. >>>>>>> 4e81ea2 (Featire specs) =======
  780. >>>>>>> 08edf50 (Featire specs) =======
  781. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  782. >>>>>>> 7a02bbe (Featire specs) =======
  783. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  784. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  785. 1 it 'show books without view more button' do
  786. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  787. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  788. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 836a973 (Rebased) ======= expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  789. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  790. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
  791. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end
  792. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  793. =======
  794. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  795. >>>>>>> 752f0c0 (Featire specs) =======
  796. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  797. >>>>>>> 08edf50 (Featire specs) =======
  798. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  799. >>>>>>> 7a02bbe (Featire specs) =======
  800. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  801. >>>>>>> 836a973 (Rebased) =======
  802. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  803. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  804. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  805. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  806. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  807. 1 context 'when view more' do
  808. 1 it 'show books with view more button' do
  809. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  810. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) visit books_path ======= context 'when view more' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when view more' do >>>>>>> 08edf50 (Featire specs) ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= context 'when view more' do >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  811. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  812. =======
  813. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  814. 1 >>>>>>> 752f0c0 (Featire specs) =======
  815. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  816. 1 >>>>>>> 08edf50 (Featire specs) =======
  817. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  818. 1 >>>>>>> 7a02bbe (Featire specs) =======
  819. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 08edf50 (Featire specs) ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  820. =======
  821. >>>>>>> 836a973 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  822. ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  823. =======
  824. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  825. 1 >>>>>>> 752f0c0 (Featire specs) =======
  826. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  827. 1 >>>>>>> 08edf50 (Featire specs) =======
  828. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  829. 1 >>>>>>> 7a02bbe (Featire specs) =======
  830. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 08edf50 (Featire specs) ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  831. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  832. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  833. 1 expect(page).to have_css('a', class: 'view_more')
  834. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end
  835. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  836. =======
  837. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  838. >>>>>>> 752f0c0 (Featire specs) =======
  839. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  840. >>>>>>> 08edf50 (Featire specs) =======
  841. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  842. >>>>>>> 7a02bbe (Featire specs) =======
  843. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  844. >>>>>>> 836a973 (Rebased) =======
  845. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  846. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  847. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  848. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  849. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  850. =======
  851. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  852. >>>>>>> 752f0c0 (Featire specs) =======
  853. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  854. >>>>>>> 08edf50 (Featire specs) =======
  855. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  856. >>>>>>> 7a02bbe (Featire specs) =======
  857. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  858. >>>>>>> 836a973 (Rebased) =======
  859. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  860. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  861. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  862. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 it 'show loaded books', js: true do
  863. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  864. 1 visit books_path
  865. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  866. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) find('a', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 08edf50 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= visit books_path >>>>>>> 7a02bbe (Featire specs) ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= find('a', class: 'view_more').click >>>>>>> 836a973 (Rebased) ======= find('a', class: 'view_more').click >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= visit books_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= visit books_path >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= visit books_path >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  867. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) expect(page).to have_content(books.last.title) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= expect(page).to have_content(books.last.title) >>>>>>> 836a973 (Rebased) ======= expect(page).to have_content(books.last.title) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  868. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD
  869. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  870. =======
  871. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  872. 1 >>>>>>> 752f0c0 (Featire specs) =======
  873. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  874. 1 >>>>>>> 08edf50 (Featire specs) =======
  875. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  876. 1 >>>>>>> 7a02bbe (Featire specs) =======
  877. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 08edf50 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  878. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  879. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  880. =======
  881. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  882. 1 >>>>>>> 752f0c0 (Featire specs) =======
  883. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  884. 1 >>>>>>> 08edf50 (Featire specs) =======
  885. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  886. 1 >>>>>>> 7a02bbe (Featire specs) =======
  887. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 08edf50 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  888. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  889. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  890. end
  891. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  892. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  893. =======
  894. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  895. >>>>>>> 752f0c0 (Featire specs) =======
  896. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  897. >>>>>>> 08edf50 (Featire specs) =======
  898. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  899. >>>>>>> 7a02bbe (Featire specs) =======
  900. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  901. >>>>>>> 836a973 (Rebased) =======
  902. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  903. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  904. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  905. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 describe 'sort' do
  906. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  907. =======
  908. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  909. >>>>>>> 752f0c0 (Featire specs) =======
  910. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  911. >>>>>>> 08edf50 (Featire specs) =======
  912. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  913. >>>>>>> 7a02bbe (Featire specs) =======
  914. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  915. >>>>>>> 836a973 (Rebased) =======
  916. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  917. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  918. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  919. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 1 shared_examples 'sort test' do
  920. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  921. =======
  922. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  923. >>>>>>> 752f0c0 (Featire specs) =======
  924. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  925. >>>>>>> 08edf50 (Featire specs) =======
  926. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  927. >>>>>>> 7a02bbe (Featire specs) =======
  928. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  929. >>>>>>> 836a973 (Rebased) =======
  930. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  931. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  932. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  933. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 5 it 'sort books' do
  934. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  935. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
  936. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
  937. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  938. 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) create(:book, title: 'Anna', price_cents: 23, ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 08edf50 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= create(:book, title: 'Anna', price_cents: 23, >>>>>>> 836a973 (Rebased) ======= create(:book, title: 'Anna', price_cents: 23, >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  939. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 20256f8 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 20256f8 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  940. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  941. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  942. ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  943. 5 FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
  944. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  945. >>>>>>> 836a973 (Rebased) =======
  946. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  947. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  948. =======
  949. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  950. >>>>>>> 752f0c0 (Featire specs) =======
  951. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  952. >>>>>>> 08edf50 (Featire specs) =======
  953. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  954. >>>>>>> 7a02bbe (Featire specs) =======
  955. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  956. >>>>>>> 836a973 (Rebased) =======
  957. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  958. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  959. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  960. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 5 visit books_path
  961. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  962. =======
  963. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  964. >>>>>>> 752f0c0 (Featire specs) =======
  965. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  966. >>>>>>> 08edf50 (Featire specs) =======
  967. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  968. >>>>>>> 7a02bbe (Featire specs) =======
  969. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  970. >>>>>>> 836a973 (Rebased) =======
  971. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  972. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  973. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  974. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  975. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  976. =======
  977. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  978. >>>>>>> 752f0c0 (Featire specs) =======
  979. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  980. >>>>>>> 08edf50 (Featire specs) =======
  981. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  982. >>>>>>> 7a02bbe (Featire specs) =======
  983. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  984. >>>>>>> 836a973 (Rebased) =======
  985. >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  986. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= =======
  987. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= =======
  988. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
  989. id: 'menu').click <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  990. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
  991. 5 click_link button
  992. end
  993. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
  994. end
  995. end
  996. 1 context 'when sort by title A to Z' do
  997. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= let(:button) { 'Title: A to Z' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Title: A to Z' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 836a973 (Rebased) ======= let(:button) { I18n.t('catalog_page.sorting.title.asc') } >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  998. 2 let(:book_title) { 'Anna' }
  999. 1 include_examples 'sort test'
  1000. end
  1001. 1 context 'when sort by title Z to A' do
  1002. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= let(:button) { 'Title: Z to A' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Title: Z to A' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 836a973 (Rebased) ======= let(:button) { I18n.t('catalog_page.sorting.title.desc') } >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  1003. 2 let(:book_title) { 'Zimbabwe' }
  1004. 1 include_examples 'sort test'
  1005. end
  1006. 1 context 'when sort by price High to Low' do
  1007. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= let(:button) { 'Price: High to Low' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Price: High to Low' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 836a973 (Rebased) ======= let(:button) { I18n.t('catalog_page.sorting.price.desc') } >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  1008. 2 let(:book_title) { 'Zimbabwe' }
  1009. 1 include_examples 'sort test'
  1010. end
  1011. 1 context 'when sort by price Low to High' do
  1012. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= let(:button) { 'Price: Low to High' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Price: Low to High' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 836a973 (Rebased) ======= let(:button) { I18n.t('catalog_page.sorting.price.asc') } >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  1013. 2 let(:book_title) { 'Anna' }
  1014. 1 include_examples 'sort test'
  1015. end
  1016. 1 context 'when sort by newest' do
  1017. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= let(:button) { 'Newest first' } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Newest first' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 836a973 (Rebased) ======= let(:button) { I18n.t('catalog_page.sorting.newer_first') } >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= let(:button) { 'Newest first' } >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  1018. 2 let(:book_title) { 'Zimbabwe' }
  1019. 1 include_examples 'sort test'
  1020. end
  1021. end
  1022. end

spec/feature/home_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 49 relevant lines. 49 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Home', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 1 describe 'Get Started' do
  5. 1 it 'on click move to catalog page' do
  6. 1 visit root_path
  7. 1 click_on 'Get Started'
  8. 1 expect(page).to have_content('Catalog')
  9. end
  10. end
  11. 1 describe 'navbar' do
  12. 2 let(:books_category) { create(:books_category) }
  13. 1 it 'on click home move to root-path' do
  14. 1 visit books_path
  15. 1 find('a', id: 'root').click
  16. 1 expect(page).to have_content('Get Started')
  17. end
  18. 1 it 'on click category name move to root-path with books that belong to this category' do
  19. 1 books_category
  20. 1 visit root_path
  21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
  22. 1 within('ul', id: 'nav') do
  23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
  24. end
  25. 1 expect(page).to have_content(books_category.category.books.first.title)
  26. end
  27. 1 context 'when guest' do
  28. 1 it 'on click login go to login page' do
  29. 1 visit root_path
  30. 1 within 'div', class: 'visible-xs' do
  31. 1 click_link I18n.t('header.log_in')
  32. end
  33. 1 expect(page).to have_content(I18n.t('header.log_in'))
  34. end
  35. 1 it 'on click sing up go to sing up page' do
  36. 1 visit root_path
  37. 1 within 'div', class: 'visible-xs' do
  38. 1 click_link I18n.t('header.sing_up')
  39. end
  40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
  41. end
  42. end
  43. 1 context 'when user', js: true do
  44. 4 let(:user) { create(:user) }
  45. 1 before do
  46. 3 sign_in(user)
  47. end
  48. 1 it 'on click account show settings' do
  49. 1 visit root_path
  50. 1 click_on I18n.t('header.account')
  51. 1 expect(page).to have_content(I18n.t('header.settings'))
  52. end
  53. 1 it 'on click account show log_out' do
  54. 1 visit root_path
  55. 1 click_on I18n.t('header.account')
  56. 1 expect(page).to have_content(I18n.t('header.log_out'))
  57. end
  58. 1 it 'log_out' do
  59. 1 visit root_path
  60. 1 click_on I18n.t('header.account')
  61. 1 click_on(I18n.t('header.log_out'), match: :first)
  62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
  63. end
  64. end
  65. end
  66. end

spec/feature/login_spec.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a5d032d (Fix) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) 100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) 19 relevant lines. 19 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Login', type: :feature do
  2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#login' do
  4. 1 before do
  5. 2 visit new_user_session_path
  6. end
  7. 1 context 'when successfully login' do
  8. 1 it 'login' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: user_second.email
  11. 1 fill_in 'user_password', with: user_second.password
  12. 1 click_on I18n.t('header.log_in')
  13. end
  14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  15. end
  16. end
  17. 1 context 'when unsuccessfully login' do
  18. 1 it 'didn`t login' do
  19. 1 within 'form', class: 'new_user', id: 'new_user' do
  20. 1 fill_in 'user_email', with: user_second.email
  21. 1 fill_in 'user_password', with: 'wrong_password'
  22. 1 click_on I18n.t('header.log_in')
  23. end
  24. 1 expect(page).to have_text 'Invalid Email or password.'
  25. end
  26. end
  27. end
  28. end

spec/feature/new_password_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 require_relative '../rails_helper'
  2. 1 require_relative '../support/shared_context'
  3. 1 RSpec.describe 'New Password', type: :feature do
  4. 3 let(:user) { FactoryBot.create(:user) }
  5. 1 describe '#new_password' do
  6. 1 it 'change password' do
  7. 1 user.reset_password('newPassword', 'newPassword')
  8. 1 expect(user.password).to eq('newPassword')
  9. end
  10. 1 it 'not validate password' do
  11. 1 visit new_user_password_path
  12. 1 fill_in 'email', with: user.email
  13. 1 click_on I18n.t('login.send_instructions')
  14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
  15. end
  16. end
  17. end

spec/feature/registration_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Registration', type: :feature do
  2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#sing_up' do
  4. 1 before do
  5. 3 visit new_user_registration_path
  6. end
  7. 1 context 'when successfully sing_up' do
  8. 1 it 'sing_up users' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
  11. 1 fill_in 'user_password', with: user.password
  12. 1 fill_in 'user_password_confirmation', with: user.password
  13. 1 click_on I18n.t('header.sing_up')
  14. end
  15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  16. end
  17. end
  18. 1 context 'when users is already exits' do
  19. 1 it 'sing_up users' do
  20. 1 within 'form', class: 'new_user', id: 'new_user' do
  21. 1 fill_in 'user_email', with: user.email
  22. 1 fill_in 'user_password', with: user.password
  23. 1 fill_in 'user_password_confirmation', with: user.password
  24. 1 click_on I18n.t('header.sing_up')
  25. end
  26. 1 expect(page).to have_text('Email has already been taken')
  27. end
  28. end
  29. 1 context 'when unsuccessfully sing_up' do
  30. 1 it 'didn`t sing_up' do
  31. 1 within 'form', class: 'new_user', id: 'new_user' do
  32. 1 fill_in 'user_email', with: FFaker::Internet.email
  33. 1 fill_in 'user_password', with: 'password'
  34. 1 fill_in 'user_password_confirmation', with: 'wrong'
  35. 1 click_on I18n.t('header.sing_up')
  36. end
  37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  38. end
  39. end
  40. end
  41. end

spec/feature/review_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 28 relevant lines. 28 lines covered and ======= 30 relevant lines. 30 lines covered and >>>>>>> ee78f39 (Rebased) ======= 30 relevant lines. 30 lines covered and >>>>>>> 836a973 (Rebased) ======= 30 relevant lines. 30 lines covered and >>>>>>> 1577aeb (Rebased) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe 'Review', type: :feature do ======= require_relative '../rails_helper' >>>>>>> ee78f39 (Rebased) ======= require_relative '../rails_helper' >>>>>>> 836a973 (Rebased) ======= require_relative '../rails_helper' >>>>>>> 1577aeb (Rebased)
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request authentication helper methods' ======= require_relative '../support/shared_context' >>>>>>> ee78f39 (Rebased) ======= require_relative '../support/shared_context' >>>>>>> 836a973 (Rebased) ======= require_relative '../support/shared_context' >>>>>>> 1577aeb (Rebased)
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. 1 include_context 'with api request global before and after hooks'
  5. =======
  6. >>>>>>> ee78f39 (Rebased) =======
  7. >>>>>>> 836a973 (Rebased) =======
  8. >>>>>>> 1577aeb (Rebased)
  9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  10. 3 =======
  11. 1 >>>>>>> ee78f39 (Rebased) =======
  12. 1 >>>>>>> 836a973 (Rebased) =======
  13. 1 >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:user) { create(:user).decorate } ======= RSpec.describe 'Review', type: :feature do >>>>>>> ee78f39 (Rebased) ======= RSpec.describe 'Review', type: :feature do >>>>>>> 836a973 (Rebased) ======= RSpec.describe 'Review', type: :feature do >>>>>>> 1577aeb (Rebased)
  14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  15. 3 =======
  16. 1 >>>>>>> ee78f39 (Rebased) =======
  17. 1 >>>>>>> 836a973 (Rebased) =======
  18. 1 >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:book) { create(:book).decorate } ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) include_context 'with api request authentication helper methods'
  19. 1 include_context 'with api request global before and after hooks' <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased)
  20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  21. 1 =======
  22. 3 >>>>>>> ee78f39 (Rebased) =======
  23. 3 >>>>>>> 836a973 (Rebased) =======
  24. 3 >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD before do ======= let(:user) { FactoryBot.create(:user).decorate } >>>>>>> ee78f39 (Rebased) ======= let(:user) { FactoryBot.create(:user).decorate } >>>>>>> 836a973 (Rebased) ======= let(:user) { FactoryBot.create(:user).decorate } >>>>>>> 1577aeb (Rebased)
  25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  26. 2 =======
  27. 3 >>>>>>> ee78f39 (Rebased) =======
  28. 3 >>>>>>> 836a973 (Rebased) =======
  29. 3 >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD sign_in(user) ======= let(:book) { FactoryBot.create(:book).decorate } >>>>>>> ee78f39 (Rebased) ======= let(:book) { FactoryBot.create(:book).decorate } >>>>>>> 836a973 (Rebased) ======= let(:book) { FactoryBot.create(:book).decorate } >>>>>>> 1577aeb (Rebased)
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  31. ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased)
  32. 1 before do
  33. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit book_path(book)
  34. end ======= sign_in(user) >>>>>>> ee78f39 (Rebased) ======= sign_in(user) >>>>>>> 836a973 (Rebased) ======= sign_in(user) >>>>>>> 1577aeb (Rebased)
  35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  36. 1 shared_examples 'review' do
  37. =======
  38. >>>>>>> ee78f39 (Rebased) =======
  39. >>>>>>> 836a973 (Rebased) =======
  40. >>>>>>> 1577aeb (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'review' do ======= visit book_path(book) >>>>>>> ee78f39 (Rebased) ======= visit book_path(book) >>>>>>> 836a973 (Rebased) ======= visit book_path(book) >>>>>>> 1577aeb (Rebased)
  41. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  42. 2 =======
  43. >>>>>>> ee78f39 (Rebased) =======
  44. >>>>>>> 836a973 (Rebased) =======
  45. >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('i', id: rating).click ======= end >>>>>>> ee78f39 (Rebased) ======= end >>>>>>> 836a973 (Rebased) ======= end >>>>>>> 1577aeb (Rebased)
  46. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  47. =======
  48. >>>>>>> ee78f39 (Rebased) =======
  49. >>>>>>> 836a973 (Rebased) =======
  50. >>>>>>> 1577aeb (Rebased)
  51. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased)
  52. 1 shared_examples 'review' do
  53. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased)
  54. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in :title, with: FFaker::Lorem.sentence(title_words) ======= it 'review' do >>>>>>> ee78f39 (Rebased) ======= it 'review' do >>>>>>> 836a973 (Rebased) ======= it 'review' do >>>>>>> 1577aeb (Rebased)
  55. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in :body, with: FFaker::Lorem.sentence(body_words) ======= find('i', id: rating).click >>>>>>> ee78f39 (Rebased) ======= find('i', id: rating).click >>>>>>> 836a973 (Rebased) ======= find('i', id: rating).click >>>>>>> 1577aeb (Rebased)
  56. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_on I18n.t('review.post') ======= fill_in :title, with: FFaker::Lorem.sentence(title_words) >>>>>>> ee78f39 (Rebased) ======= fill_in :title, with: FFaker::Lorem.sentence(title_words) >>>>>>> 836a973 (Rebased) ======= fill_in :title, with: FFaker::Lorem.sentence(title_words) >>>>>>> 1577aeb (Rebased)
  57. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  58. ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased)
  59. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
  60. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased)
  61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  62. =======
  63. >>>>>>> ee78f39 (Rebased) =======
  64. >>>>>>> 836a973 (Rebased) =======
  65. >>>>>>> 1577aeb (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(result)
  66. end ======= click_on I18n.t('review.post') >>>>>>> ee78f39 (Rebased) ======= click_on I18n.t('review.post') >>>>>>> 836a973 (Rebased) ======= click_on I18n.t('review.post') >>>>>>> 1577aeb (Rebased)
  67. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased)
  68. 2 expect(page).to have_content(result)
  69. end
  70. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) end
  71. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  72. =======
  73. >>>>>>> ee78f39 (Rebased) =======
  74. >>>>>>> 836a973 (Rebased) =======
  75. >>>>>>> 1577aeb (Rebased)
  76. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  77. =======
  78. >>>>>>> ee78f39 (Rebased) =======
  79. >>>>>>> 836a973 (Rebased) =======
  80. >>>>>>> 1577aeb (Rebased) 1 describe '#post review', js: true do
  81. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  82. =======
  83. >>>>>>> ee78f39 (Rebased) =======
  84. >>>>>>> 836a973 (Rebased) =======
  85. >>>>>>> 1577aeb (Rebased) 1 context 'when review posted' do
  86. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  87. =======
  88. >>>>>>> ee78f39 (Rebased) =======
  89. >>>>>>> 836a973 (Rebased) =======
  90. >>>>>>> 1577aeb (Rebased) 2 let(:rating) { "star#{rand(1..5)}" }
  91. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  92. =======
  93. >>>>>>> ee78f39 (Rebased) =======
  94. >>>>>>> 836a973 (Rebased) =======
  95. >>>>>>> 1577aeb (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:title_words) { 3 } ======= let(:title_words) { 5 } >>>>>>> ee78f39 (Rebased) ======= let(:title_words) { 5 } >>>>>>> 836a973 (Rebased) ======= let(:title_words) { 5 } >>>>>>> 1577aeb (Rebased)
  96. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  97. =======
  98. >>>>>>> ee78f39 (Rebased) =======
  99. >>>>>>> 836a973 (Rebased) =======
  100. >>>>>>> 1577aeb (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:body_words) { 5 } ======= let(:body_words) { 10 } >>>>>>> ee78f39 (Rebased) ======= let(:body_words) { 10 } >>>>>>> 836a973 (Rebased) ======= let(:body_words) { 10 } >>>>>>> 1577aeb (Rebased)
  101. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  102. =======
  103. >>>>>>> ee78f39 (Rebased) =======
  104. >>>>>>> 836a973 (Rebased) =======
  105. >>>>>>> 1577aeb (Rebased) 2 let(:result) { user.name_or_email }
  106. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  107. 1 include_examples 'review'
  108. end
  109. ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased)
  110. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD context 'when review not been posted' do
  111. 2 let(:rating) { "star#{rand(1..5)}" }
  112. 2 let(:title_words) { 80 }
  113. 2 let(:body_words) { 30 }
  114. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
  115. 1 ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) include_examples 'review'
  116. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  117. =======
  118. >>>>>>> ee78f39 (Rebased) =======
  119. >>>>>>> 836a973 (Rebased) =======
  120. >>>>>>> 1577aeb (Rebased) end
  121. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased)
  122. 1 context 'when review not been posted' do
  123. 2 let(:rating) { "star#{rand(1..5)}" }
  124. 2 let(:title_words) { 80 }
  125. 2 let(:body_words) { 30 }
  126. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
  127. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased)
  128. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased)
  129. 1 include_examples 'review'
  130. end
  131. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) end
  132. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  133. =======
  134. >>>>>>> ee78f39 (Rebased) =======
  135. >>>>>>> 836a973 (Rebased) =======
  136. >>>>>>> 1577aeb (Rebased) end

spec/feature/settings_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Settings', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 4 let(:user) { create(:user) }
  5. 1 before do
  6. 3 sign_in(user)
  7. 3 visit edit_user_path(user.id)
  8. 3 click_link I18n.t('settings.privacy')
  9. end
  10. 1 describe '#email_change' do
  11. 1 it 'change email' do
  12. 1 within('div', id: 'email') do
  13. 1 fill_in :email, with: FFaker::Internet.email
  14. 1 click_on I18n.t('settings.save')
  15. end
  16. 1 user.confirm
  17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  18. end
  19. end
  20. 1 describe '#password_change' do
  21. 1 context 'when error' do
  22. 1 it 'didnt change password' do
  23. 1 within('div', id: 'password') do
  24. 1 fill_in :current_password, with: user.password
  25. 1 fill_in :password, with: 'newPassword'
  26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
  27. 1 click_on I18n.t('settings.save')
  28. end
  29. 1 user.confirm
  30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
  31. end
  32. end
  33. 1 context 'when successful' do
  34. 1 it 'didnt change password' do
  35. 1 within('div', id: 'password') do
  36. 1 fill_in :current_password, with: user.password
  37. 1 fill_in :password, with: 'newPassword'
  38. 1 fill_in :password_confirmation, with: 'newPassword'
  39. 1 click_on I18n.t('settings.save')
  40. end
  41. 1 user.confirm
  42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
  43. end
  44. end
  45. end
  46. end

spec/feature/shipping_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Shipping', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:user) { FactoryBot.create(:user) }
  5. 1 let(:attributes_for) { attributes_for(:shipping) }
  6. 1 describe '#fill_in', js: true do
  7. 1 it 'fill in shipping' do
  8. 1 sign_in(user)
  9. 1 visit edit_user_path(user.id)
  10. 1 within('div#shipping.col-md-5.mb-40') do
  11. 1 find_all('div', class: 'form-group')[0] do
  12. fill_in :first_name, with: attributes_for[:first_name]
  13. end
  14. 1 find_all('div', class: 'form-group')[1] do
  15. fill_in :last_name, with: attributes_for[:last_name]
  16. end
  17. 1 find_all('div', class: 'form-group')[2] do
  18. fill_in :address, with: attributes_for[:address]
  19. end
  20. 1 find_all('div', class: 'form-group')[3] do
  21. fill_in :city, with: attributes_for[:city]
  22. end
  23. 1 find_all('div', class: 'form-group')[4] do
  24. fill_in :zip, with: attributes_for[:zip]
  25. end
  26. 1 find_all('div', class: 'form-group')[5] do
  27. fill_in :country, with: attributes_for[:country]
  28. end
  29. 1 find_all('div', class: 'form-group')[6] do
  30. fill_in :phone, with: attributes_for[:phone]
  31. end
  32. 1 click_on I18n.t('settings.save')
  33. end
  34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  35. end
  36. end
  37. end

spec/feature/user_spec.rb

100.0% lines covered

42 relevant lines. 42 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'User', type: :feature do
  2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
  3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
  4. 1 describe '#sing_up' do
  5. 1 context 'when successfully sing_up' do
  6. 1 before do
  7. 1 visit new_user_registration_path
  8. 1 within 'form', class: 'new_user', id: 'new_user' do
  9. 1 fill_in 'user_email', with: user.email
  10. 1 fill_in 'user_password', with: user.password
  11. 1 fill_in 'user_password_confirmation', with: user.password
  12. 1 click_on I18n.t('header.sing_up')
  13. end
  14. end
  15. 1 it 'sing_up user' do
  16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  17. end
  18. end
  19. 1 context 'when unsuccessfully sing_up' do
  20. 1 it 'didn`t sing_up' do
  21. 1 visit new_user_registration_path
  22. 1 within 'form', class: 'new_user', id: 'new_user' do
  23. 1 fill_in 'user_email', with: FFaker::Internet.email
  24. 1 fill_in 'user_password', with: 'wrong'
  25. 1 fill_in 'user_password_confirmation', with: 'wrong'
  26. 1 click_on I18n.t('header.sing_up')
  27. end
  28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  29. end
  30. end
  31. end
  32. 1 describe '#login' do
  33. 1 before do
  34. 2 user_second.confirm
  35. end
  36. 1 context 'when successfully login' do
  37. 1 it 'login' do
  38. 1 visit new_user_session_path
  39. 1 within 'form', class: 'new_user', id: 'new_user' do
  40. 1 fill_in 'user_email', with: user_second.email
  41. 1 fill_in 'user_password', with: user_second.password
  42. 1 click_on I18n.t('header.log_in')
  43. end
  44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  45. end
  46. end
  47. 1 context 'when unsuccessfully login' do
  48. 1 it 'didn`t login' do
  49. 1 visit new_user_session_path
  50. 1 within 'form', class: 'new_user', id: 'new_user' do
  51. 1 fill_in 'user_email', with: user_second.email
  52. 1 fill_in 'user_password', with: 'wrong_password'
  53. 1 click_on I18n.t('header.log_in')
  54. end
  55. 1 expect(page).to have_text 'Invalid Email or password.'
  56. end
  57. end
  58. end
  59. end

spec/models/admin_user_spec.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AdminUser, type: :model do
  3. 1 context 'when validations' do
  4. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) it { is_expected.to validate_presence_of(:email) }
  5. 2 it { is_expected.to validate_presence_of(:password) }
  6. end
  7. end

spec/models/author_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. <<<<<<< HEAD <<<<<<< HEAD 1 >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD it { is_expected.to validate_presence_of(:email) } ======= RSpec.describe Author, type: :model do >>>>>>> ee78f39 (Rebased)
  2. <<<<<<< HEAD
  3. 2 =======
  4. 1 >>>>>>> ee78f39 (Rebased) <<<<<<< HEAD it { is_expected.to validate_presence_of(:password) } ======= describe 'author' do
  5. ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD context 'when validations' do ======= RSpec.describe Author, type: :model do >>>>>>> 836a973 (Rebased) ======= RSpec.describe Author, type: :model do >>>>>>> 1577aeb (Rebased)
  6. <<<<<<< HEAD <<<<<<< HEAD
  7. 2 it { is_expected.to validate_presence_of(:first_name) }
  8. 2 it { is_expected.to validate_presence_of(:last_name) }
  9. end >>>>>>> ee78f39 (Rebased)
  10. end
  11. end

spec/models/author_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. =======
  2. >>>>>>> 836a973 (Rebased) =======
  3. >>>>>>> 1577aeb (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD RSpec.describe Author, type: :model do
  4. 1 ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) describe 'author' do
  5. 1 context 'when validations' do
  6. 2 it { is_expected.to validate_presence_of(:first_name) }
  7. 2 it { is_expected.to validate_presence_of(:last_name) }
  8. end
  9. 1 context 'when associations' do
  10. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  11. 2 it { is_expected.to have_many(:books).through(:authors_books) }
  12. end
  13. end
  14. end

spec/models/authors_book_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe AuthorsBook, type: :model do <<<<<<< HEAD
  2. 1 describe 'authors_book' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:book) }
  5. 2 it { is_expected.to validate_presence_of(:author) }
  6. end
  7. <<<<<<< HEAD
  8. 1 context 'when associations' do
  9. 2 it { is_expected.to belong_to(:author) }
  10. 2 it { is_expected.to belong_to(:book) }
  11. end
  12. end
  13. end

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Billing, type: :model do
  2. 1 describe 'billing' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
  7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
  8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  11. end
  12. 1 context 'when not validations' do
  13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  20. end
  21. 1 context 'when associations' do
  22. 2 it { is_expected.to belong_to(:user) }
  23. end
  24. end
  25. end

spec/models/book_spec.rb

100.0% lines covered

16 relevant lines. 16 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Book, type: :model do
  2. 1 describe 'books' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:title) }
  5. 2 it { is_expected.to validate_presence_of(:description) }
  6. 2 it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
  7. 2 it { is_expected.to validate_presence_of(:year_of_publication) }
  8. 2 it { is_expected.to validate_presence_of(:quantity) }
  9. 2 it { is_expected.to validate_presence_of(:materials) }
  10. 2 it { is_expected.to validate_presence_of(:dimensions) }
  11. end
  12. 1 context 'when associations' do
  13. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  14. 2 it { is_expected.to have_many(:authors).through(:authors_books) }
  15. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  16. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
  17. 2 it { is_expected.to have_many(:reviews).dependent(:destroy) }
  18. end
  19. end
  20. end

spec/models/books_category_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe BooksCategory, type: :model do
  2. 1 describe 'books_categories' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:book) }
  5. 2 it { is_expected.to validate_presence_of(:category) }
  6. end
  7. 1 context 'when associations' do
  8. 2 it { is_expected.to belong_to(:category) }
  9. 2 it { is_expected.to belong_to(:book) }
  10. end
  11. end
  12. end

spec/models/category_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Category, type: :model do
  2. 1 describe 'category' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:name) }
  5. end
  6. 1 context 'when associations' do
  7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
  9. end
  10. end
  11. end

spec/models/review_spec.rb

100.0% lines covered

14 relevant lines. 14 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe Review, type: :model do
  3. 1 describe 'review' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:title) }
  6. 2 it { is_expected.to validate_presence_of(:body) }
  7. 2 it { is_expected.to validate_presence_of(:rating) }
  8. 2 it { is_expected.to validate_presence_of(:verified) }
  9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
  10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
  11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
  12. end
  13. 1 context 'when associations' do
  14. 2 it { is_expected.to belong_to(:book) }
  15. 2 it { is_expected.to belong_to(:user) }
  16. end
  17. end
  18. end

spec/models/shipping_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Shipping, type: :model do
  2. 1 describe 'shipping' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
  7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
  8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  11. end
  12. 1 context 'when not validations' do
  13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  20. end
  21. 1 context 'when associations' do
  22. 2 it { is_expected.to belong_to(:user) }
  23. end
  24. end
  25. end

spec/models/user_spec.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe User, type: :model do
  2. 1 let(:user) { FactoryBot.create(:user) }
  3. 1 describe 'author' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:email) }
  6. 2 it { is_expected.to validate_presence_of(:password) }
  7. end
  8. 1 context 'with associations' do
  9. 2 it { is_expected.to have_one(:billing) }
  10. 2 it { is_expected.to have_one(:shipping) }
  11. end
  12. end
  13. end

spec/queryes/book_query_spec.rb

100.0% lines covered

45 relevant lines. 45 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe BookQuery do
  3. 1 shared_examples 'sort test' do
  4. 5 it 'sort' do
  5. 5 books
  6. 5 expect(test).to eq(result)
  7. end
  8. end
  9. 3 let(:titles) { %w[Adam Zimbabwe] }
  10. 1 let(:books_dates) do
  11. 1 ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
  12. end
  13. 1 describe 'all books sort' do
  14. 1 context 'when sort by title A to Z' do
  15. 1 let(:books) do
  16. 1 create(:book, title: titles.first)
  17. 1 create(:book, title: titles.second)
  18. end
  19. 2 let(:result) { titles.second }
  20. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
  21. 1 include_examples 'sort test'
  22. end
  23. 1 context 'when sort title Z to A' do
  24. 1 let(:books) do
  25. 1 create(:book, title: titles.first)
  26. 1 create(:book, title: titles.second)
  27. end
  28. 2 let(:result) { titles.first }
  29. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
  30. 1 include_examples 'sort test'
  31. end
  32. 1 context 'when sort by price High to Low' do
  33. 1 let(:books) do
  34. 1 create(:book, price_cents: 75)
  35. 1 create(:book, price_cents: 23)
  36. end
  37. 2 let(:result) { 75 }
  38. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
  39. 1 include_examples 'sort test'
  40. end
  41. 1 context 'when sort price Low to High' do
  42. 1 let(:books) do
  43. 1 create(:book, price_cents: 75)
  44. 1 create(:book, price_cents: 23)
  45. end
  46. 2 let(:result) { 23 }
  47. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
  48. 1 include_examples 'sort test'
  49. end
  50. 1 context 'when sort by Newest' do
  51. 1 let(:books) do
  52. 1 create(:book, created_at: books_dates.first)
  53. 1 create(:book, created_at: books_dates.second)
  54. end
  55. 2 let(:result) { books_dates.first }
  56. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
  57. 1 include_examples 'sort test'
  58. end
  59. end
  60. end

spec/support/configs/capybara.rb

100.0% lines covered

19 relevant lines. 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed.
    
  1. 1 RSpec.describe 'Author' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:first_name) { FFaker::Name.first_name }
  5. 2 let(:last_name) { FFaker::Name.last_name }
  6. 2 let(:new_name) { FFaker::Name.first_name }
  7. 2 let(:old_name) { author.first_name }
  8. 4 let(:author) { create(:author) }
  9. 1 before do
  10. 4 sign_in(create(:admin_user), :admin_user)
  11. end
  12. 1 it 'can create an author' do
  13. 1 visit 'admin/authors'
  14. 1 click_link('New Author')
  15. 1 fill_in 'author[first_name]', with: first_name
  16. 1 fill_in 'author[last_name]', with: last_name
  17. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
  18. end
  19. 1 it 'can delete an author' do
  20. 1 author
  21. 1 visit 'admin/authors'
  22. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
  23. end
  24. 1 it 'can view an author' do
  25. 1 author
  26. 1 visit 'admin/authors'
  27. 1 click_link('View')
  28. 1 expect(page).to have_content(author.first_name)
  29. end
  30. 1 it 'can edit an author' do
  31. 1 author
  32. 1 visit 'admin/authors'
  33. 1 click_link('Edit')
  34. 1 fill_in 'author[first_name]', with: new_name
  35. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
  36. end
  37. end

spec/feature/admin/book_spec.rb

100.0% lines covered

43 relevant lines. 43 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 7 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:book) { create(:book) } ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) let(:category_one) { FactoryBot.create(:category) }
  5. 3 let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  6. 1 let(:params) do
  7. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  8. 1 =======
  9. 4 >>>>>>> d0dc1f1 (Featire specs) =======
  10. 4 >>>>>>> 752f0c0 (Featire specs) =======
  11. 4 >>>>>>> 4e81ea2 (Featire specs) =======
  12. 4 >>>>>>> 08edf50 (Featire specs) =======
  13. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  14. 4 >>>>>>> 7a02bbe (Featire specs) =======
  15. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) { title: FFaker::Book.title,
  16. description: FFaker::Book.description,
  17. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 08edf50 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  18. dimensions: FFaker::Book.cover,
  19. year_of_publication: FFaker::Number.rand(1900..2022),
  20. materials: 'Soft cover',
  21. quantity: FFaker::Number.rand(2..5) }
  22. end
  23. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  24. 1 before do
  25. 6 sign_in(create(:admin_user), :admin_user)
  26. 6 book
  27. 6 visit 'admin/books'
  28. end
  29. 1 it 'can create an book' do
  30. 1 click_link('New Book')
  31. 1 fill_in 'book[title]', with: params[:title]
  32. 1 fill_in 'book[description]', with: params[:description]
  33. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
  34. 1 fill_in 'book[price_cents]', with: params[:price_cents]
  35. 1 fill_in 'book[materials]', with: params[:materials]
  36. 1 fill_in 'book[dimensions]', with: params[:dimensions]
  37. 1 fill_in 'book[quantity]', with: params[:quantity]
  38. 1 click_button('Create Book')
  39. 1 expect(page).to have_content(params[:title])
  40. end
  41. 1 it 'can delete an book' do
  42. 1 click_link('Delete')
  43. 1 expect(page).not_to have_content(book.title)
  44. end
  45. 1 it 'can view an book' do
  46. 1 click_link('View')
  47. 1 expect(page).to have_content(book.title)
  48. end
  49. 1 it 'can edit an book' do
  50. 1 click_link('Edit')
  51. 1 fill_in 'book[title]', with: 'New title'
  52. 1 click_button('Update Book')
  53. 1 expect(page).to have_content('New title')
  54. end
  55. 1 context 'when image' do
  56. 1 before do
  57. 2 click_link('Edit')
  58. 2 page.attach_file('book[images][]', './app/assets/images/Web-Book-Cover.png')
  59. 2 click_on 'Update Book'
  60. end
  61. 1 it 'can add images to book' do
  62. 1 expect(book.reload.images.count).to eq(1)
  63. end
  64. 1 it 'can delete images from book' do
  65. 1 click_link('Edit')
  66. 1 click_link('Delete')
  67. 1 expect(book.reload.images.count).to eq(0)
  68. end
  69. end
  70. end

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Category' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:category_name) { FFaker::Book.genre }
  5. 5 let(:category) { create(:category) }
  6. 1 before do
  7. 4 sign_in(create(:admin_user), :admin_user)
  8. 4 category
  9. 4 visit 'admin/categories'
  10. =======
  11. 7 >>>>>>> d0dc1f1 (Featire specs) =======
  12. 7 >>>>>>> 752f0c0 (Featire specs) =======
  13. 7 >>>>>>> 4e81ea2 (Featire specs) =======
  14. 7 >>>>>>> 08edf50 (Featire specs) =======
  15. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  16. 7 >>>>>>> 7a02bbe (Featire specs) =======
  17. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 08edf50 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  18. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) ======= describe '#show book' do >>>>>>> 08edf50 (Featire specs) ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  19. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books info' do >>>>>>> 08edf50 (Featire specs) ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  21. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  22. 1 visit "books/#{book.id}"
  23. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  25. =======
  26. >>>>>>> d0dc1f1 (Featire specs) =======
  27. >>>>>>> 752f0c0 (Featire specs) =======
  28. >>>>>>> 4e81ea2 (Featire specs) =======
  29. >>>>>>> 08edf50 (Featire specs) =======
  30. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  31. >>>>>>> 7a02bbe (Featire specs) =======
  32. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 08edf50 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  34. =======
  35. >>>>>>> d0dc1f1 (Featire specs) =======
  36. >>>>>>> 752f0c0 (Featire specs) =======
  37. >>>>>>> 4e81ea2 (Featire specs) =======
  38. >>>>>>> 08edf50 (Featire specs) =======
  39. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  40. >>>>>>> 7a02bbe (Featire specs) =======
  41. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  42. 1 click_button('Create Category') ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  43. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 08edf50 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  45. =======
  46. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  47. 1 >>>>>>> 752f0c0 (Featire specs) =======
  48. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  49. 1 >>>>>>> 08edf50 (Featire specs) =======
  50. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  51. 1 >>>>>>> 7a02bbe (Featire specs) =======
  52. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  53. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 08edf50 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  55. 1 click_link('Delete')
  56. =======
  57. >>>>>>> d0dc1f1 (Featire specs) =======
  58. >>>>>>> 752f0c0 (Featire specs) =======
  59. >>>>>>> 4e81ea2 (Featire specs) =======
  60. >>>>>>> 08edf50 (Featire specs) =======
  61. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  62. >>>>>>> 7a02bbe (Featire specs) =======
  63. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  65. =======
  66. >>>>>>> d0dc1f1 (Featire specs) =======
  67. >>>>>>> 752f0c0 (Featire specs) =======
  68. >>>>>>> 4e81ea2 (Featire specs) =======
  69. >>>>>>> 08edf50 (Featire specs) =======
  70. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  71. >>>>>>> 7a02bbe (Featire specs) =======
  72. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) expect(page).to have_content('Catalog')
  73. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  76. =======
  77. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  78. 1 >>>>>>> 752f0c0 (Featire specs) =======
  79. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  80. 1 >>>>>>> 08edf50 (Featire specs) =======
  81. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  82. 1 >>>>>>> 7a02bbe (Featire specs) =======
  83. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when test read more' do >>>>>>> 08edf50 (Featire specs) ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  84. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show read more' do >>>>>>> 08edf50 (Featire specs) ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  85. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  86. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 08edf50 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  87. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  88. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 08edf50 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  89. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  90. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) ======= click_link 'Read More' >>>>>>> 08edf50 (Featire specs) ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  91. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 08edf50 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  92. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  93. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  94. 1 =======
  95. >>>>>>> d0dc1f1 (Featire specs) =======
  96. >>>>>>> 752f0c0 (Featire specs) =======
  97. >>>>>>> 4e81ea2 (Featire specs) =======
  98. >>>>>>> 08edf50 (Featire specs) =======
  99. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  100. >>>>>>> 7a02bbe (Featire specs) =======
  101. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  102. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
  103. end

spec/feature/billing_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Billing', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  6. 2 let(:user) { create(:user) }
  7. 1 let(:attributes_for) { attributes_for(:billing) }
  8. 1 describe '#fill_in', js: true do
  9. 1 it 'fill in billing' do
  10. 1 sign_in(user)
  11. 1 visit edit_user_path(user.id)
  12. 1 within('div#billing.col-md-5.mb-40') do
  13. 1 find_all('div', class: 'form-group')[0] do
  14. fill_in :first_name, with: attributes_for[:first_name]
  15. end
  16. 1 find_all('div', class: 'form-group')[1] do
  17. fill_in :last_name, with: attributes_for[:last_name]
  18. end
  19. 1 find_all('div', class: 'form-group')[2] do
  20. fill_in :address, with: attributes_for[:address]
  21. end
  22. 1 find_all('div', class: 'form-group')[3] do
  23. fill_in :city, with: attributes_for[:city]
  24. end
  25. 1 find_all('div', class: 'form-group')[4] do
  26. fill_in :zip, with: attributes_for[:zip]
  27. end
  28. 1 find_all('div', class: 'form-group')[5] do
  29. fill_in :country, with: attributes_for[:country]
  30. end
  31. 1 find_all('div', class: 'form-group')[6] do
  32. fill_in :phone, with: attributes_for[:phone]
  33. end
  34. 1 click_on I18n.t('settings.save')
  35. end
  36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  37. end
  38. end
  39. end

spec/feature/book_spec.rb

100.0% lines covered

104 relevant lines. 104 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book', type: :feature do
  2. 5 let(:category_one) { create(:category) }
  3. 3 let(:category_two) { create(:category) }
  4. 1 let(:params) do
  5. 4 { title: FFaker::Book.title,
  6. description: FFaker::Book.description,
  7. price_cents: FFaker::Number.rand(1..100),
  8. dimensions: FFaker::Book.cover,
  9. year_of_publication: FFaker::Number.rand(1900..2022),
  10. materials: 'Soft cover',
  11. quantity: FFaker::Number.rand(2..5) }
  12. end
  13. 7 let(:book) { create(:book).decorate }
  14. 1 describe '#show book' do
  15. 1 it 'show books info' do
  16. 1 visit "books/#{book.id}"
  17. 1 expect(page).to have_content(book.title)
  18. end
  19. 1 it 'clicked Beck to results' do
  20. 1 visit "books/#{book.id}"
  21. 1 find('a', class: 'general-back-link').click
  22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
  23. end
  24. 1 context 'when test read more' do
  25. 1 it 'show read more' do
  26. 1 visit "books/#{book.id}"
  27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
  28. end
  29. 1 it 'clicked read more', js: true do
  30. 1 visit "books/#{book.id}"
  31. 1 click_link I18n.t('book_page.read_more')
  32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
  33. end
  34. end
  35. =======
  36. >>>>>>> d0dc1f1 (Featire specs) =======
  37. >>>>>>> 752f0c0 (Featire specs) =======
  38. >>>>>>> 4e81ea2 (Featire specs) =======
  39. >>>>>>> 08edf50 (Featire specs) =======
  40. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  41. >>>>>>> 7a02bbe (Featire specs) =======
  42. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 context 'when quantity changes', js: true do
  43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  44. =======
  45. >>>>>>> d0dc1f1 (Featire specs) =======
  46. >>>>>>> 752f0c0 (Featire specs) =======
  47. >>>>>>> 4e81ea2 (Featire specs) =======
  48. >>>>>>> 08edf50 (Featire specs) =======
  49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  50. >>>>>>> 7a02bbe (Featire specs) =======
  51. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 before do
  52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  53. 2 visit "books/#{book.id}"
  54. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  55. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
  57. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  59. 1 =======
  60. 2 >>>>>>> d0dc1f1 (Featire specs) =======
  61. 2 >>>>>>> 752f0c0 (Featire specs) =======
  62. 2 >>>>>>> 4e81ea2 (Featire specs) =======
  63. 2 >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  64. 2 find('a', class: 'inc').click
  65. end
  66. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= find('a', class: 'inc').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  67. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  68. =======
  69. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  70. >>>>>>> 7a02bbe (Featire specs) =======
  71. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
  72. =======
  73. >>>>>>> d0dc1f1 (Featire specs) =======
  74. >>>>>>> 752f0c0 (Featire specs) =======
  75. >>>>>>> 4e81ea2 (Featire specs) =======
  76. >>>>>>> 08edf50 (Featire specs) end
  77. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  78. =======
  79. >>>>>>> d0dc1f1 (Featire specs) =======
  80. >>>>>>> 752f0c0 (Featire specs) =======
  81. >>>>>>> 4e81ea2 (Featire specs) =======
  82. >>>>>>> 08edf50 (Featire specs)
  83. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  84. =======
  85. >>>>>>> d0dc1f1 (Featire specs) =======
  86. >>>>>>> 752f0c0 (Featire specs) =======
  87. >>>>>>> 4e81ea2 (Featire specs) =======
  88. >>>>>>> 08edf50 (Featire specs) 1 <<<<<<< HEAD it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs)
  89. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  90. =======
  91. >>>>>>> d0dc1f1 (Featire specs) =======
  92. >>>>>>> 752f0c0 (Featire specs) =======
  93. >>>>>>> 4e81ea2 (Featire specs) =======
  94. >>>>>>> 08edf50 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price * 2}")
  95. end
  96. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  97. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) it 'decrease quantity', js: true do ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  98. 1 find('a', class: 'dec').click
  99. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price}")
  100. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  101. end
  102. end
  103. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  104. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  105. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  106. end
  107. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  108. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  109. 1 describe '#catalog' do
  110. 1 describe 'filter by category' do
  111. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  112. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) describe '#catalog' do
  113. 1 describe 'filter by category' do
  114. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) before do
  115. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  116. =======
  117. >>>>>>> d0dc1f1 (Featire specs) =======
  118. >>>>>>> 752f0c0 (Featire specs) =======
  119. >>>>>>> 4e81ea2 (Featire specs) =======
  120. >>>>>>> 08edf50 (Featire specs) =======
  121. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  122. >>>>>>> 7a02bbe (Featire specs) =======
  123. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 category_one.books.create(params)
  124. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  125. =======
  126. >>>>>>> d0dc1f1 (Featire specs) =======
  127. >>>>>>> 752f0c0 (Featire specs) =======
  128. >>>>>>> 4e81ea2 (Featire specs) =======
  129. >>>>>>> 08edf50 (Featire specs) =======
  130. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  131. >>>>>>> 7a02bbe (Featire specs) =======
  132. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 visit books_path
  133. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  134. =======
  135. >>>>>>> d0dc1f1 (Featire specs) =======
  136. >>>>>>> 752f0c0 (Featire specs) =======
  137. >>>>>>> 4e81ea2 (Featire specs) =======
  138. >>>>>>> 08edf50 (Featire specs) =======
  139. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  140. >>>>>>> 7a02bbe (Featire specs) =======
  141. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  142. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  143. =======
  144. >>>>>>> d0dc1f1 (Featire specs) =======
  145. >>>>>>> 752f0c0 (Featire specs) =======
  146. >>>>>>> 4e81ea2 (Featire specs) =======
  147. >>>>>>> 08edf50 (Featire specs) =======
  148. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  149. >>>>>>> 7a02bbe (Featire specs) =======
  150. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  151. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  152. =======
  153. >>>>>>> d0dc1f1 (Featire specs) =======
  154. >>>>>>> 752f0c0 (Featire specs) =======
  155. >>>>>>> 4e81ea2 (Featire specs) =======
  156. >>>>>>> 08edf50 (Featire specs) =======
  157. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  158. >>>>>>> 7a02bbe (Featire specs) =======
  159. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 after do
  160. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  161. =======
  162. >>>>>>> d0dc1f1 (Featire specs) =======
  163. >>>>>>> 752f0c0 (Featire specs) =======
  164. >>>>>>> 4e81ea2 (Featire specs) =======
  165. >>>>>>> 08edf50 (Featire specs) =======
  166. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  167. >>>>>>> 7a02bbe (Featire specs) =======
  168. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 category_one.destroy
  169. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  170. =======
  171. >>>>>>> d0dc1f1 (Featire specs) =======
  172. >>>>>>> 752f0c0 (Featire specs) =======
  173. >>>>>>> 4e81ea2 (Featire specs) =======
  174. >>>>>>> 08edf50 (Featire specs) =======
  175. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  176. >>>>>>> 7a02bbe (Featire specs) =======
  177. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  178. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  179. =======
  180. >>>>>>> d0dc1f1 (Featire specs) =======
  181. >>>>>>> 752f0c0 (Featire specs) =======
  182. >>>>>>> 4e81ea2 (Featire specs) =======
  183. >>>>>>> 08edf50 (Featire specs) =======
  184. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  185. >>>>>>> 7a02bbe (Featire specs) =======
  186. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  187. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  188. =======
  189. >>>>>>> d0dc1f1 (Featire specs) =======
  190. >>>>>>> 752f0c0 (Featire specs) =======
  191. >>>>>>> 4e81ea2 (Featire specs) =======
  192. >>>>>>> 08edf50 (Featire specs) =======
  193. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  194. >>>>>>> 7a02bbe (Featire specs) =======
  195. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 it 'show book count for category' do
  196. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  197. =======
  198. >>>>>>> d0dc1f1 (Featire specs) =======
  199. >>>>>>> 752f0c0 (Featire specs) =======
  200. >>>>>>> 4e81ea2 (Featire specs) =======
  201. >>>>>>> 08edf50 (Featire specs) =======
  202. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  203. >>>>>>> 7a02bbe (Featire specs) =======
  204. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_one.books.size)
  205. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  206. =======
  207. >>>>>>> d0dc1f1 (Featire specs) =======
  208. >>>>>>> 752f0c0 (Featire specs) =======
  209. >>>>>>> 4e81ea2 (Featire specs) =======
  210. >>>>>>> 08edf50 (Featire specs) =======
  211. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  212. >>>>>>> 7a02bbe (Featire specs) =======
  213. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  214. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  215. =======
  216. >>>>>>> d0dc1f1 (Featire specs) =======
  217. >>>>>>> 752f0c0 (Featire specs) =======
  218. >>>>>>> 4e81ea2 (Featire specs) =======
  219. >>>>>>> 08edf50 (Featire specs) =======
  220. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  221. >>>>>>> 7a02bbe (Featire specs) =======
  222. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  223. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  224. 1 it 'filter book by category' do
  225. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
  226. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  227. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) it 'filter book by category' do
  228. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
  229. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) click_on category_one.name
  230. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  231. =======
  232. >>>>>>> d0dc1f1 (Featire specs) =======
  233. >>>>>>> 752f0c0 (Featire specs) =======
  234. >>>>>>> 4e81ea2 (Featire specs) =======
  235. >>>>>>> 08edf50 (Featire specs) =======
  236. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  237. >>>>>>> 7a02bbe (Featire specs) =======
  238. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  239. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  240. =======
  241. >>>>>>> d0dc1f1 (Featire specs) =======
  242. >>>>>>> 752f0c0 (Featire specs) =======
  243. >>>>>>> 4e81ea2 (Featire specs) =======
  244. >>>>>>> 08edf50 (Featire specs) =======
  245. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  246. >>>>>>> 7a02bbe (Featire specs) =======
  247. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  248. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  249. =======
  250. >>>>>>> d0dc1f1 (Featire specs) =======
  251. >>>>>>> 752f0c0 (Featire specs) =======
  252. >>>>>>> 4e81ea2 (Featire specs) =======
  253. >>>>>>> 08edf50 (Featire specs) =======
  254. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  255. >>>>>>> 7a02bbe (Featire specs) =======
  256. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_one.books.first.title)
  257. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  258. =======
  259. >>>>>>> d0dc1f1 (Featire specs) =======
  260. >>>>>>> 752f0c0 (Featire specs) =======
  261. >>>>>>> 4e81ea2 (Featire specs) =======
  262. >>>>>>> 08edf50 (Featire specs) =======
  263. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  264. >>>>>>> 7a02bbe (Featire specs) =======
  265. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  266. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  267. =======
  268. >>>>>>> d0dc1f1 (Featire specs) =======
  269. >>>>>>> 752f0c0 (Featire specs) =======
  270. >>>>>>> 4e81ea2 (Featire specs) =======
  271. >>>>>>> 08edf50 (Featire specs) =======
  272. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  273. >>>>>>> 7a02bbe (Featire specs) =======
  274. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  275. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  276. =======
  277. >>>>>>> d0dc1f1 (Featire specs) =======
  278. >>>>>>> 752f0c0 (Featire specs) =======
  279. >>>>>>> 4e81ea2 (Featire specs) =======
  280. >>>>>>> 08edf50 (Featire specs) =======
  281. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  282. >>>>>>> 7a02bbe (Featire specs) =======
  283. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  284. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  285. =======
  286. >>>>>>> d0dc1f1 (Featire specs) =======
  287. >>>>>>> 752f0c0 (Featire specs) =======
  288. >>>>>>> 4e81ea2 (Featire specs) =======
  289. >>>>>>> 08edf50 (Featire specs) =======
  290. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  291. >>>>>>> 7a02bbe (Featire specs) =======
  292. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 describe 'filter by all books' do
  293. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  294. =======
  295. >>>>>>> d0dc1f1 (Featire specs) =======
  296. >>>>>>> 752f0c0 (Featire specs) =======
  297. >>>>>>> 4e81ea2 (Featire specs) =======
  298. >>>>>>> 08edf50 (Featire specs) =======
  299. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  300. >>>>>>> 7a02bbe (Featire specs) =======
  301. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 before do
  302. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  303. =======
  304. >>>>>>> d0dc1f1 (Featire specs) =======
  305. >>>>>>> 752f0c0 (Featire specs) =======
  306. >>>>>>> 4e81ea2 (Featire specs) =======
  307. >>>>>>> 08edf50 (Featire specs) =======
  308. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  309. >>>>>>> 7a02bbe (Featire specs) =======
  310. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 category_one.books.create(params)
  311. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  312. 2 category_two.books.create(params)
  313. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  314. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit books_path ======= category_two.books.create(params) >>>>>>> d0dc1f1 (Featire specs) ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) ======= category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) ======= category_two.books.create(params) >>>>>>> 08edf50 (Featire specs) ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  315. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_on I18n.t('catalog_page.all') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  316. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  317. 2 click_on 'All'
  318. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  319. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  320. =======
  321. >>>>>>> d0dc1f1 (Featire specs) =======
  322. >>>>>>> 752f0c0 (Featire specs) =======
  323. >>>>>>> 4e81ea2 (Featire specs) =======
  324. >>>>>>> 08edf50 (Featire specs) =======
  325. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  326. >>>>>>> 7a02bbe (Featire specs) =======
  327. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  328. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  329. =======
  330. >>>>>>> d0dc1f1 (Featire specs) =======
  331. >>>>>>> 752f0c0 (Featire specs) =======
  332. >>>>>>> 4e81ea2 (Featire specs) =======
  333. >>>>>>> 08edf50 (Featire specs) =======
  334. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  335. >>>>>>> 7a02bbe (Featire specs) =======
  336. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 after do
  337. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  338. =======
  339. >>>>>>> d0dc1f1 (Featire specs) =======
  340. >>>>>>> 752f0c0 (Featire specs) =======
  341. >>>>>>> 4e81ea2 (Featire specs) =======
  342. >>>>>>> 08edf50 (Featire specs) =======
  343. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  344. >>>>>>> 7a02bbe (Featire specs) =======
  345. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 category_one.destroy
  346. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  347. =======
  348. >>>>>>> d0dc1f1 (Featire specs) =======
  349. >>>>>>> 752f0c0 (Featire specs) =======
  350. >>>>>>> 4e81ea2 (Featire specs) =======
  351. >>>>>>> 08edf50 (Featire specs) =======
  352. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  353. >>>>>>> 7a02bbe (Featire specs) =======
  354. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 category_two.destroy
  355. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  356. =======
  357. >>>>>>> d0dc1f1 (Featire specs) =======
  358. >>>>>>> 752f0c0 (Featire specs) =======
  359. >>>>>>> 4e81ea2 (Featire specs) =======
  360. >>>>>>> 08edf50 (Featire specs) =======
  361. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  362. >>>>>>> 7a02bbe (Featire specs) =======
  363. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  364. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  365. =======
  366. >>>>>>> d0dc1f1 (Featire specs) =======
  367. >>>>>>> 752f0c0 (Featire specs) =======
  368. >>>>>>> 4e81ea2 (Featire specs) =======
  369. >>>>>>> 08edf50 (Featire specs) =======
  370. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  371. >>>>>>> 7a02bbe (Featire specs) =======
  372. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  373. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  374. =======
  375. >>>>>>> d0dc1f1 (Featire specs) =======
  376. >>>>>>> 752f0c0 (Featire specs) =======
  377. >>>>>>> 4e81ea2 (Featire specs) =======
  378. >>>>>>> 08edf50 (Featire specs) =======
  379. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  380. >>>>>>> 7a02bbe (Featire specs) =======
  381. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 it 'shown books for first category' do
  382. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  383. =======
  384. >>>>>>> d0dc1f1 (Featire specs) =======
  385. >>>>>>> 752f0c0 (Featire specs) =======
  386. >>>>>>> 4e81ea2 (Featire specs) =======
  387. >>>>>>> 08edf50 (Featire specs) =======
  388. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  389. >>>>>>> 7a02bbe (Featire specs) =======
  390. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_one.books.first.title)
  391. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  392. =======
  393. >>>>>>> d0dc1f1 (Featire specs) =======
  394. >>>>>>> 752f0c0 (Featire specs) =======
  395. >>>>>>> 4e81ea2 (Featire specs) =======
  396. >>>>>>> 08edf50 (Featire specs) =======
  397. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  398. >>>>>>> 7a02bbe (Featire specs) =======
  399. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  400. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  401. =======
  402. >>>>>>> d0dc1f1 (Featire specs) =======
  403. >>>>>>> 752f0c0 (Featire specs) =======
  404. >>>>>>> 4e81ea2 (Featire specs) =======
  405. >>>>>>> 08edf50 (Featire specs) =======
  406. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  407. >>>>>>> 7a02bbe (Featire specs) =======
  408. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  409. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  410. =======
  411. >>>>>>> d0dc1f1 (Featire specs) =======
  412. >>>>>>> 752f0c0 (Featire specs) =======
  413. >>>>>>> 4e81ea2 (Featire specs) =======
  414. >>>>>>> 08edf50 (Featire specs) =======
  415. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  416. >>>>>>> 7a02bbe (Featire specs) =======
  417. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 it 'shown books for second category' do
  418. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  419. =======
  420. >>>>>>> d0dc1f1 (Featire specs) =======
  421. >>>>>>> 752f0c0 (Featire specs) =======
  422. >>>>>>> 4e81ea2 (Featire specs) =======
  423. >>>>>>> 08edf50 (Featire specs) =======
  424. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  425. >>>>>>> 7a02bbe (Featire specs) =======
  426. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_two.books.first.title)
  427. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  428. end
  429. end
  430. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  431. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  432. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  433. end
  434. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  435. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  436. =======
  437. >>>>>>> d0dc1f1 (Featire specs) =======
  438. >>>>>>> 752f0c0 (Featire specs) =======
  439. >>>>>>> 4e81ea2 (Featire specs) =======
  440. >>>>>>> 08edf50 (Featire specs) =======
  441. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  442. >>>>>>> 7a02bbe (Featire specs) =======
  443. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 describe 'load_more' do
  444. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  445. =======
  446. >>>>>>> d0dc1f1 (Featire specs) =======
  447. >>>>>>> 752f0c0 (Featire specs) =======
  448. >>>>>>> 4e81ea2 (Featire specs) =======
  449. >>>>>>> 08edf50 (Featire specs) =======
  450. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  451. >>>>>>> 7a02bbe (Featire specs) =======
  452. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 before do
  453. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  454. =======
  455. >>>>>>> d0dc1f1 (Featire specs) =======
  456. >>>>>>> 752f0c0 (Featire specs) =======
  457. >>>>>>> 4e81ea2 (Featire specs) =======
  458. >>>>>>> 08edf50 (Featire specs) =======
  459. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  460. >>>>>>> 7a02bbe (Featire specs) =======
  461. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 3 <<<<<<< HEAD 24.times do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  462. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  463. =======
  464. >>>>>>> d0dc1f1 (Featire specs) =======
  465. >>>>>>> 752f0c0 (Featire specs) =======
  466. >>>>>>> 4e81ea2 (Featire specs) =======
  467. >>>>>>> 08edf50 (Featire specs) =======
  468. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  469. >>>>>>> 7a02bbe (Featire specs) =======
  470. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 72 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD books << create(:book)
  471. end
  472. end ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 08edf50 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  473. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  474. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  475. 4 =======
  476. >>>>>>> d0dc1f1 (Featire specs) =======
  477. >>>>>>> 752f0c0 (Featire specs) =======
  478. >>>>>>> 4e81ea2 (Featire specs) =======
  479. >>>>>>> 08edf50 (Featire specs) =======
  480. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  481. >>>>>>> 7a02bbe (Featire specs) =======
  482. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  483. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  484. 1 =======
  485. 4 >>>>>>> d0dc1f1 (Featire specs) =======
  486. 4 >>>>>>> 752f0c0 (Featire specs) =======
  487. 4 >>>>>>> 4e81ea2 (Featire specs) =======
  488. 4 >>>>>>> 08edf50 (Featire specs) =======
  489. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  490. 4 >>>>>>> 7a02bbe (Featire specs) =======
  491. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) ======= let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) ======= let(:books) { [] } >>>>>>> 08edf50 (Featire specs) ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  492. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  493. 1 visit books_path
  494. =======
  495. >>>>>>> d0dc1f1 (Featire specs) =======
  496. >>>>>>> 752f0c0 (Featire specs) =======
  497. >>>>>>> 4e81ea2 (Featire specs) =======
  498. >>>>>>> 08edf50 (Featire specs) =======
  499. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  500. >>>>>>> 7a02bbe (Featire specs) =======
  501. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  502. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  503. 1 it 'show books without view more button' do
  504. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  505. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  506. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  507. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  508. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
  509. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  510. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  511. =======
  512. >>>>>>> d0dc1f1 (Featire specs) =======
  513. >>>>>>> 752f0c0 (Featire specs) =======
  514. >>>>>>> 4e81ea2 (Featire specs) =======
  515. >>>>>>> 08edf50 (Featire specs) =======
  516. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  517. >>>>>>> 7a02bbe (Featire specs) =======
  518. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  519. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  520. 1 context 'when view more' do
  521. 1 it 'show books with view more button' do
  522. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  523. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit books_path ======= context 'when view more' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when view more' do >>>>>>> 08edf50 (Featire specs) ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  524. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  525. =======
  526. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  527. 1 >>>>>>> 752f0c0 (Featire specs) =======
  528. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  529. 1 >>>>>>> 08edf50 (Featire specs) =======
  530. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  531. 1 >>>>>>> 7a02bbe (Featire specs) =======
  532. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 08edf50 (Featire specs) ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  533. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  534. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  535. 1 expect(page).to have_css('a', class: 'view_more')
  536. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  537. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  538. =======
  539. >>>>>>> d0dc1f1 (Featire specs) =======
  540. >>>>>>> 752f0c0 (Featire specs) =======
  541. >>>>>>> 4e81ea2 (Featire specs) =======
  542. >>>>>>> 08edf50 (Featire specs) =======
  543. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  544. >>>>>>> 7a02bbe (Featire specs) =======
  545. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  546. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  547. =======
  548. >>>>>>> d0dc1f1 (Featire specs) =======
  549. >>>>>>> 752f0c0 (Featire specs) =======
  550. >>>>>>> 4e81ea2 (Featire specs) =======
  551. >>>>>>> 08edf50 (Featire specs) =======
  552. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  553. >>>>>>> 7a02bbe (Featire specs) =======
  554. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 it 'show loaded books', js: true do
  555. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  556. 1 visit books_path
  557. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  558. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  559. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(books.last.title) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  560. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  561. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  562. =======
  563. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  564. 1 >>>>>>> 752f0c0 (Featire specs) =======
  565. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  566. 1 >>>>>>> 08edf50 (Featire specs) =======
  567. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  568. 1 >>>>>>> 7a02bbe (Featire specs) =======
  569. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 08edf50 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  570. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  571. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  572. end
  573. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  574. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  575. =======
  576. >>>>>>> d0dc1f1 (Featire specs) =======
  577. >>>>>>> 752f0c0 (Featire specs) =======
  578. >>>>>>> 4e81ea2 (Featire specs) =======
  579. >>>>>>> 08edf50 (Featire specs) =======
  580. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  581. >>>>>>> 7a02bbe (Featire specs) =======
  582. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 describe 'sort' do
  583. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  584. =======
  585. >>>>>>> d0dc1f1 (Featire specs) =======
  586. >>>>>>> 752f0c0 (Featire specs) =======
  587. >>>>>>> 4e81ea2 (Featire specs) =======
  588. >>>>>>> 08edf50 (Featire specs) =======
  589. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  590. >>>>>>> 7a02bbe (Featire specs) =======
  591. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 shared_examples 'sort test' do
  592. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  593. =======
  594. >>>>>>> d0dc1f1 (Featire specs) =======
  595. >>>>>>> 752f0c0 (Featire specs) =======
  596. >>>>>>> 4e81ea2 (Featire specs) =======
  597. >>>>>>> 08edf50 (Featire specs) =======
  598. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  599. >>>>>>> 7a02bbe (Featire specs) =======
  600. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 5 it 'sort books' do
  601. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  602. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
  603. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
  604. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  605. 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:book, title: 'Anna', price_cents: 23, ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> d0dc1f1 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 08edf50 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  606. <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  607. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  608. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  609. 5 FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
  610. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  611. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  612. =======
  613. >>>>>>> d0dc1f1 (Featire specs) =======
  614. >>>>>>> 752f0c0 (Featire specs) =======
  615. >>>>>>> 4e81ea2 (Featire specs) =======
  616. >>>>>>> 08edf50 (Featire specs) =======
  617. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  618. >>>>>>> 7a02bbe (Featire specs) =======
  619. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 5 visit books_path
  620. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  621. =======
  622. >>>>>>> d0dc1f1 (Featire specs) =======
  623. >>>>>>> 752f0c0 (Featire specs) =======
  624. >>>>>>> 4e81ea2 (Featire specs) =======
  625. >>>>>>> 08edf50 (Featire specs) =======
  626. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  627. >>>>>>> 7a02bbe (Featire specs) =======
  628. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  629. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  630. =======
  631. >>>>>>> d0dc1f1 (Featire specs) =======
  632. >>>>>>> 752f0c0 (Featire specs) =======
  633. >>>>>>> 4e81ea2 (Featire specs) =======
  634. >>>>>>> 08edf50 (Featire specs) =======
  635. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  636. >>>>>>> 7a02bbe (Featire specs) =======
  637. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
  638. id: 'menu').click ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 08edf50 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  639. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
  640. 5 click_link button
  641. end
  642. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
  643. end
  644. end
  645. 1 context 'when sort by title A to Z' do
  646. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= let(:button) { 'Title: A to Z' } >>>>>>> d0dc1f1 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  647. 2 let(:book_title) { 'Anna' }
  648. 1 include_examples 'sort test'
  649. end
  650. 1 context 'when sort by title Z to A' do
  651. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= let(:button) { 'Title: Z to A' } >>>>>>> d0dc1f1 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  652. 2 let(:book_title) { 'Zimbabwe' }
  653. 1 include_examples 'sort test'
  654. end
  655. 1 context 'when sort by price High to Low' do
  656. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= let(:button) { 'Price: High to Low' } >>>>>>> d0dc1f1 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  657. 2 let(:book_title) { 'Zimbabwe' }
  658. 1 include_examples 'sort test'
  659. end
  660. 1 context 'when sort by price Low to High' do
  661. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= let(:button) { 'Price: Low to High' } >>>>>>> d0dc1f1 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  662. 2 let(:book_title) { 'Anna' }
  663. 1 include_examples 'sort test'
  664. end
  665. 1 context 'when sort by newest' do
  666. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= let(:button) { 'Newest first' } >>>>>>> d0dc1f1 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  667. 2 let(:book_title) { 'Zimbabwe' }
  668. 1 include_examples 'sort test'
  669. end
  670. end
  671. end

spec/feature/cart_spec.rb

96.55% lines covered

29 relevant lines. 28 lines covered and 1 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe 'Cart', type: :feature, js: true do
  3. 5 let(:book) { FactoryBot.create(:book) }
  4. 1 before do
  5. 4 book
  6. 4 visit book_path(book.id)
  7. 4 click_button I18n.t('book_page.add_to_card')
  8. end
  9. 1 describe '#add_book_to_order' do
  10. 1 it 'add book to order' do
  11. 1 within('span', class: 'shop-icon') do
  12. 1 expect(page).to have_content(1)
  13. end
  14. end
  15. end
  16. 1 describe '#quantity_change' do
  17. 1 it 'book quantity inc' do
  18. 1 visit orders_path
  19. 1 within("a#inc#{book.id}.input-link") do
  20. 1 find('i.fa.fa-plus.line-heaght-40').click
  21. end
  22. 1 sleep(2)
  23. 1 expect(find_field("counter#{book.id}").value).to eq('2')
  24. end
  25. 1 it 'book quantity dec' do
  26. 1 visit orders_path
  27. 1 within("a#dec#{book.id}.input-link") do
  28. 1 find('i.fa.fa-minus.line-heaght-40').click
  29. end
  30. 1 sleep(2)
  31. 1 expect(find_field("counter#{book.id}").value).to eq('0')
  32. end
  33. end
  34. 1 describe '#remove_book_from_cart' do
  35. 1 it 'book quantity change' do
  36. 1 visit orders_path
  37. 1 find('button.close.general-cart-close').click
  38. expect(page).to have_content(I18n.t('order.messages.delete'))
  39. end
  40. end
  41. end

spec/feature/coupon_spec.rb

100.0% lines covered

30 relevant lines. 30 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 require_relative '../support/shared_context'
  3. 1 RSpec.describe 'Coupon', type: :feature, js: true do
  4. 1 include_context 'with api request authentication helper methods'
  5. 1 include_context 'with api request global before and after hooks'
  6. 5 let(:user) { FactoryBot.create(:user) }
  7. 4 let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
  8. 5 let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
  9. 5 let(:book) { FactoryBot.create(:book, price_cents: 1234) }
  10. 5 let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
  11. 1 before do
  12. 4 sign_in(user)
  13. 4 order
  14. 4 order_book
  15. 4 visit orders_path
  16. end
  17. 1 describe '#valid coupon' do
  18. 1 before do
  19. 3 fill_in 'input', with: coupon.code
  20. 3 click_button I18n.t('order.apply')
  21. end
  22. 1 it 'sub price' do
  23. 1 expect(page).to have_content("SubTotal:\n€ 12.34")
  24. end
  25. 1 it 'use coupon' do
  26. 1 expect(page).to have_content("Coupon:\n€ 1.85")
  27. end
  28. 1 it 'count price with coupon' do
  29. 1 expect(page).to have_content('Order Total: € 10.49')
  30. end
  31. end
  32. 1 describe '#invalid coupon' do
  33. 1 it 'show error message' do
  34. 1 fill_in 'input', with: 'dasdasdqe1243wasad'
  35. 1 click_button I18n.t('order.apply')
  36. 1 expect(page).to have_content(I18n.t('order.coupon.error'))
  37. end
  38. end
  39. end

spec/feature/home_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 49 relevant lines. 49 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Home', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 1 describe 'Get Started' do
  5. 1 it 'on click move to catalog page' do
  6. 1 visit root_path
  7. 1 click_on 'Get Started'
  8. 1 expect(page).to have_content('Catalog')
  9. end
  10. end
  11. 1 describe 'navbar' do
  12. 2 let(:books_category) { create(:books_category) }
  13. 1 it 'on click home move to root-path' do
  14. 1 visit books_path
  15. 1 find('a', id: 'root').click
  16. 1 expect(page).to have_content('Get Started')
  17. end
  18. 1 it 'on click category name move to root-path with books that belong to this category' do
  19. 1 books_category
  20. 1 visit root_path
  21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
  22. 1 within('ul', id: 'nav') do
  23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
  24. end
  25. 1 expect(page).to have_content(books_category.category.books.first.title)
  26. end
  27. 1 context 'when guest' do
  28. 1 it 'on click login go to login page' do
  29. 1 visit root_path
  30. 1 within 'div', class: 'visible-xs' do
  31. 1 click_link I18n.t('header.log_in')
  32. end
  33. 1 expect(page).to have_content(I18n.t('header.log_in'))
  34. end
  35. 1 it 'on click sing up go to sing up page' do
  36. 1 visit root_path
  37. 1 within 'div', class: 'visible-xs' do
  38. 1 click_link I18n.t('header.sing_up')
  39. end
  40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
  41. end
  42. end
  43. 1 context 'when user', js: true do
  44. 4 let(:user) { create(:user) }
  45. 1 before do
  46. 3 sign_in(user)
  47. end
  48. 1 it 'on click account show settings' do
  49. 1 visit root_path
  50. 1 click_on I18n.t('header.account')
  51. 1 expect(page).to have_content(I18n.t('header.settings'))
  52. end
  53. 1 it 'on click account show log_out' do
  54. 1 visit root_path
  55. 1 click_on I18n.t('header.account')
  56. 1 expect(page).to have_content(I18n.t('header.log_out'))
  57. end
  58. 1 it 'log_out' do
  59. 1 visit root_path
  60. 1 click_on I18n.t('header.account')
  61. 1 click_on(I18n.t('header.log_out'), match: :first)
  62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
  63. end
  64. end
  65. end
  66. end

spec/feature/login_spec.rb

>>>>>>> a5d032d (Fix) 100.0% lines covered

<<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Login', type: :feature do
  2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#login' do
  4. 1 before do
  5. 2 visit new_user_session_path
  6. end
  7. 1 context 'when successfully login' do
  8. 1 it 'login' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: user_second.email
  11. 1 fill_in 'user_password', with: user_second.password
  12. 1 click_on I18n.t('header.log_in')
  13. end
  14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  15. end
  16. end
  17. 1 context 'when unsuccessfully login' do
  18. 1 it 'didn`t login' do
  19. 1 within 'form', class: 'new_user', id: 'new_user' do
  20. 1 fill_in 'user_email', with: user_second.email
  21. 1 fill_in 'user_password', with: 'wrong_password'
  22. 1 click_on I18n.t('header.log_in')
  23. end
  24. 1 expect(page).to have_text 'Invalid Email or password.'
  25. end
  26. end
  27. end
  28. end

spec/feature/new_password_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 require_relative '../rails_helper'
  2. 1 require_relative '../support/shared_context'
  3. 1 RSpec.describe 'New Password', type: :feature do
  4. 3 let(:user) { FactoryBot.create(:user) }
  5. 1 describe '#new_password' do
  6. 1 it 'change password' do
  7. 1 user.reset_password('newPassword', 'newPassword')
  8. 1 expect(user.password).to eq('newPassword')
  9. end
  10. 1 it 'not validate password' do
  11. 1 visit new_user_password_path
  12. 1 fill_in 'email', with: user.email
  13. 1 click_on I18n.t('login.send_instructions')
  14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
  15. end
  16. end
  17. end

spec/feature/registration_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Registration', type: :feature do
  2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#sing_up' do
  4. 1 before do
  5. 3 visit new_user_registration_path
  6. end
  7. 1 context 'when successfully sing_up' do
  8. 1 it 'sing_up users' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
  11. 1 fill_in 'user_password', with: user.password
  12. 1 fill_in 'user_password_confirmation', with: user.password
  13. 1 click_on I18n.t('header.sing_up')
  14. end
  15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  16. end
  17. end
  18. 1 context 'when users is already exits' do
  19. 1 it 'sing_up users' do
  20. 1 within 'form', class: 'new_user', id: 'new_user' do
  21. 1 fill_in 'user_email', with: user.email
  22. 1 fill_in 'user_password', with: user.password
  23. 1 fill_in 'user_password_confirmation', with: user.password
  24. 1 click_on I18n.t('header.sing_up')
  25. end
  26. 1 expect(page).to have_text('Email has already been taken')
  27. end
  28. end
  29. 1 context 'when unsuccessfully sing_up' do
  30. 1 it 'didn`t sing_up' do
  31. 1 within 'form', class: 'new_user', id: 'new_user' do
  32. 1 fill_in 'user_email', with: FFaker::Internet.email
  33. 1 fill_in 'user_password', with: 'password'
  34. 1 fill_in 'user_password_confirmation', with: 'wrong'
  35. 1 click_on I18n.t('header.sing_up')
  36. end
  37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  38. end
  39. end
  40. end
  41. end

spec/feature/review_spec.rb

100.0% lines covered

28 relevant lines. 28 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Review', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 3 let(:user) { create(:user).decorate }
  5. 3 let(:book) { create(:book).decorate }
  6. 1 before do
  7. 2 sign_in(user)
  8. 2 visit book_path(book)
  9. end
  10. 1 shared_examples 'review' do
  11. 2 it 'review' do
  12. 2 find('i', id: rating).click
  13. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
  14. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
  15. 2 click_on I18n.t('review.post')
  16. 2 expect(page).to have_content(result)
  17. end
  18. end
  19. 1 describe '#post review', js: true do
  20. 1 context 'when review posted' do
  21. 2 let(:rating) { "star#{rand(1..5)}" }
  22. 2 let(:title_words) { 3 }
  23. 2 let(:body_words) { 5 }
  24. 2 let(:result) { user.name_or_email }
  25. 1 include_examples 'review'
  26. end
  27. 1 context 'when review not been posted' do
  28. 2 let(:rating) { "star#{rand(1..5)}" }
  29. 2 let(:title_words) { 80 }
  30. 2 let(:body_words) { 30 }
  31. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
  32. 1 include_examples 'review'
  33. end
  34. end
  35. end

spec/feature/settings_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Settings', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 4 let(:user) { create(:user) }
  5. 1 before do
  6. 3 sign_in(user)
  7. 3 visit edit_user_path(user.id)
  8. 3 click_link I18n.t('settings.privacy')
  9. end
  10. 1 describe '#email_change' do
  11. 1 it 'change email' do
  12. 1 within('div', id: 'email') do
  13. 1 fill_in :email, with: FFaker::Internet.email
  14. 1 click_on I18n.t('settings.save')
  15. end
  16. 1 user.confirm
  17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  18. end
  19. end
  20. 1 describe '#password_change' do
  21. 1 context 'when error' do
  22. 1 it 'didnt change password' do
  23. 1 within('div', id: 'password') do
  24. 1 fill_in :current_password, with: user.password
  25. 1 fill_in :password, with: 'newPassword'
  26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
  27. 1 click_on I18n.t('settings.save')
  28. end
  29. 1 user.confirm
  30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
  31. end
  32. end
  33. 1 context 'when successful' do
  34. 1 it 'didnt change password' do
  35. 1 within('div', id: 'password') do
  36. 1 fill_in :current_password, with: user.password
  37. 1 fill_in :password, with: 'newPassword'
  38. 1 fill_in :password_confirmation, with: 'newPassword'
  39. 1 click_on I18n.t('settings.save')
  40. end
  41. 1 user.confirm
  42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
  43. end
  44. end
  45. end
  46. end

spec/feature/shipping_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Shipping', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:user) { FactoryBot.create(:user) }
  5. 1 let(:attributes_for) { attributes_for(:shipping) }
  6. 1 describe '#fill_in', js: true do
  7. 1 it 'fill in shipping' do
  8. 1 sign_in(user)
  9. 1 visit edit_user_path(user.id)
  10. 1 within('div#shipping.col-md-5.mb-40') do
  11. 1 find_all('div', class: 'form-group')[0] do
  12. fill_in :first_name, with: attributes_for[:first_name]
  13. end
  14. 1 find_all('div', class: 'form-group')[1] do
  15. fill_in :last_name, with: attributes_for[:last_name]
  16. end
  17. 1 find_all('div', class: 'form-group')[2] do
  18. fill_in :address, with: attributes_for[:address]
  19. end
  20. 1 find_all('div', class: 'form-group')[3] do
  21. fill_in :city, with: attributes_for[:city]
  22. end
  23. 1 find_all('div', class: 'form-group')[4] do
  24. fill_in :zip, with: attributes_for[:zip]
  25. end
  26. 1 find_all('div', class: 'form-group')[5] do
  27. fill_in :country, with: attributes_for[:country]
  28. end
  29. 1 find_all('div', class: 'form-group')[6] do
  30. fill_in :phone, with: attributes_for[:phone]
  31. end
  32. 1 click_on I18n.t('settings.save')
  33. end
  34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  35. end
  36. end
  37. end

spec/feature/user_spec.rb

100.0% lines covered

42 relevant lines. 42 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'User', type: :feature do
  2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
  3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
  4. 1 describe '#sing_up' do
  5. 1 context 'when successfully sing_up' do
  6. 1 before do
  7. 1 visit new_user_registration_path
  8. 1 within 'form', class: 'new_user', id: 'new_user' do
  9. 1 fill_in 'user_email', with: user.email
  10. 1 fill_in 'user_password', with: user.password
  11. 1 fill_in 'user_password_confirmation', with: user.password
  12. 1 click_on I18n.t('header.sing_up')
  13. end
  14. end
  15. 1 it 'sing_up user' do
  16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  17. end
  18. end
  19. 1 context 'when unsuccessfully sing_up' do
  20. 1 it 'didn`t sing_up' do
  21. 1 visit new_user_registration_path
  22. 1 within 'form', class: 'new_user', id: 'new_user' do
  23. 1 fill_in 'user_email', with: FFaker::Internet.email
  24. 1 fill_in 'user_password', with: 'wrong'
  25. 1 fill_in 'user_password_confirmation', with: 'wrong'
  26. 1 click_on I18n.t('header.sing_up')
  27. end
  28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  29. end
  30. end
  31. end
  32. 1 describe '#login' do
  33. 1 before do
  34. 2 user_second.confirm
  35. end
  36. 1 context 'when successfully login' do
  37. 1 it 'login' do
  38. 1 visit new_user_session_path
  39. 1 within 'form', class: 'new_user', id: 'new_user' do
  40. 1 fill_in 'user_email', with: user_second.email
  41. 1 fill_in 'user_password', with: user_second.password
  42. 1 click_on I18n.t('header.log_in')
  43. end
  44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  45. end
  46. end
  47. 1 context 'when unsuccessfully login' do
  48. 1 it 'didn`t login' do
  49. 1 visit new_user_session_path
  50. 1 within 'form', class: 'new_user', id: 'new_user' do
  51. 1 fill_in 'user_email', with: user_second.email
  52. 1 fill_in 'user_password', with: 'wrong_password'
  53. 1 click_on I18n.t('header.log_in')
  54. end
  55. 1 expect(page).to have_text 'Invalid Email or password.'
  56. end
  57. end
  58. end
  59. end

spec/models/admin_user_spec.rb

100.0% lines covered

5 relevant lines. 5 lines covered and ======= 20 relevant lines. 20 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe AdminUser, type: :model do ======= RSpec.describe 'Homes', type: :feature do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD context 'when validations' do ======= describe 'Get Started' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'Get Started' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  5. 2 =======
  6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  7. 1 >>>>>>> 752f0c0 (Featire specs) =======
  8. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  9. 1 >>>>>>> 08edf50 (Featire specs) =======
  10. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  11. 1 >>>>>>> 7a02bbe (Featire specs) =======
  12. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:email) } ======= it 'on click move to catalog page' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  14. 2 =======
  15. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  16. 1 >>>>>>> 752f0c0 (Featire specs) =======
  17. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  18. 1 >>>>>>> 08edf50 (Featire specs) =======
  19. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  20. 1 >>>>>>> 7a02bbe (Featire specs) =======
  21. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:password) } ======= visit root_path >>>>>>> d0dc1f1 (Featire specs) ======= visit root_path >>>>>>> 752f0c0 (Featire specs) ======= visit root_path >>>>>>> 4e81ea2 (Featire specs) ======= visit root_path >>>>>>> 08edf50 (Featire specs) ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit root_path >>>>>>> 7a02bbe (Featire specs) ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  23. 1 click_on 'Get Started'
  24. 1 expect(page).to have_content('Catalog')
  25. end
  26. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  27. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  28. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  29. 1 describe 'navbar' do
  30. 2 let(:books_category) { FactoryBot.create(:books_category) }
  31. 1 it 'on click home move to root-path' do
  32. 1 visit books_path
  33. 1 find('a', id: 'root').click
  34. 1 expect(page).to have_content('Get Started')
  35. end
  36. 1 it 'on click category name move to root-path with books that belong to this category' do
  37. 1 books_category
  38. 1 visit root_path
  39. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
  40. 1 within('ul', id: 'nav') do
  41. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
  42. end
  43. 1 expect(page).to have_content(books_category.category.books.first.title)
  44. end
  45. end
  46. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end

spec/models/author_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe Author, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  3. 1 describe 'author' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:first_name) }
  6. 2 it { is_expected.to validate_presence_of(:last_name) }
  7. end
  8. =======
  9. >>>>>>> d0dc1f1 (Featire specs) =======
  10. >>>>>>> 752f0c0 (Featire specs) =======
  11. >>>>>>> 4e81ea2 (Featire specs) =======
  12. >>>>>>> 08edf50 (Featire specs) =======
  13. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  14. >>>>>>> 7a02bbe (Featire specs) =======
  15. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  17. =======
  18. >>>>>>> d0dc1f1 (Featire specs) =======
  19. >>>>>>> 752f0c0 (Featire specs) =======
  20. >>>>>>> 4e81ea2 (Featire specs) =======
  21. >>>>>>> 08edf50 (Featire specs) =======
  22. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  23. >>>>>>> 7a02bbe (Featire specs) =======
  24. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD context 'when associations' do ======= RSpec.describe Author, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  26. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  27. 1 describe 'author' do
  28. 1 context 'when validations' do
  29. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  31. =======
  32. >>>>>>> d0dc1f1 (Featire specs) =======
  33. >>>>>>> 752f0c0 (Featire specs) =======
  34. >>>>>>> 4e81ea2 (Featire specs) =======
  35. >>>>>>> 08edf50 (Featire specs) =======
  36. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  37. >>>>>>> 7a02bbe (Featire specs) =======
  38. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to have_many(:books).through(:authors_books) } ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  40. =======
  41. >>>>>>> d0dc1f1 (Featire specs) =======
  42. >>>>>>> 752f0c0 (Featire specs) =======
  43. >>>>>>> 4e81ea2 (Featire specs) =======
  44. >>>>>>> 08edf50 (Featire specs) =======
  45. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  46. >>>>>>> 7a02bbe (Featire specs) =======
  47. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  48. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  49. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  50. 1 context 'when associations' do
  51. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  52. 2 it { is_expected.to have_many(:books).through(:authors_books) }
  53. end
  54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  55. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  56. =======
  57. >>>>>>> d0dc1f1 (Featire specs) =======
  58. >>>>>>> 752f0c0 (Featire specs) =======
  59. >>>>>>> 4e81ea2 (Featire specs) =======
  60. >>>>>>> 08edf50 (Featire specs) =======
  61. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  62. >>>>>>> 7a02bbe (Featire specs) =======
  63. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end

spec/models/authors_book_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) RSpec.describe AuthorsBook, type: :model do
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  4. =======
  5. >>>>>>> d0dc1f1 (Featire specs) =======
  6. >>>>>>> 752f0c0 (Featire specs) =======
  7. >>>>>>> 4e81ea2 (Featire specs) =======
  8. >>>>>>> 08edf50 (Featire specs) =======
  9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  10. >>>>>>> 7a02bbe (Featire specs) =======
  11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 describe 'authors_book' do
  12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  13. =======
  14. >>>>>>> d0dc1f1 (Featire specs) =======
  15. >>>>>>> 752f0c0 (Featire specs) =======
  16. >>>>>>> 4e81ea2 (Featire specs) =======
  17. >>>>>>> 08edf50 (Featire specs) =======
  18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  19. >>>>>>> 7a02bbe (Featire specs) =======
  20. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 context 'when validations' do
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  22. 2 it { is_expected.to validate_presence_of(:book) }
  23. 2 it { is_expected.to validate_presence_of(:author) }
  24. end
  25. 1 context 'when associations' do
  26. 2 it { is_expected.to belong_to(:author) }
  27. 2 it { is_expected.to belong_to(:book) }
  28. end
  29. end
  30. end

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Billing, type: :model do
  2. 1 describe 'billing' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  7. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  8. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  10. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  11. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  12. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  13. =======
  14. >>>>>>> d0dc1f1 (Featire specs) =======
  15. >>>>>>> 752f0c0 (Featire specs) =======
  16. >>>>>>> 4e81ea2 (Featire specs) =======
  17. >>>>>>> 08edf50 (Featire specs) =======
  18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  19. >>>>>>> 7a02bbe (Featire specs) =======
  20. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  22. =======
  23. >>>>>>> d0dc1f1 (Featire specs) =======
  24. >>>>>>> 752f0c0 (Featire specs) =======
  25. >>>>>>> 4e81ea2 (Featire specs) =======
  26. >>>>>>> 08edf50 (Featire specs) =======
  27. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  28. >>>>>>> 7a02bbe (Featire specs) =======
  29. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  31. 1 context 'when not validations' do
  32. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  33. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  34. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  35. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  36. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  37. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  38. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  39. end
  40. =======
  41. >>>>>>> d0dc1f1 (Featire specs) =======
  42. >>>>>>> 752f0c0 (Featire specs) =======
  43. >>>>>>> 4e81ea2 (Featire specs) =======
  44. >>>>>>> 08edf50 (Featire specs) =======
  45. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  46. >>>>>>> 7a02bbe (Featire specs) =======
  47. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 context 'when associations' do
  48. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  49. =======
  50. >>>>>>> d0dc1f1 (Featire specs) =======
  51. >>>>>>> 752f0c0 (Featire specs) =======
  52. >>>>>>> 4e81ea2 (Featire specs) =======
  53. >>>>>>> 08edf50 (Featire specs) =======
  54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  55. >>>>>>> 7a02bbe (Featire specs) =======
  56. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to belong_to(:user) } ======= it { is_expected.to belong_to(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  57. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  58. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  59. 2 it { is_expected.to belong_to(:book) }
  60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  62. =======
  63. >>>>>>> d0dc1f1 (Featire specs) =======
  64. >>>>>>> 752f0c0 (Featire specs) =======
  65. >>>>>>> 4e81ea2 (Featire specs) =======
  66. >>>>>>> 08edf50 (Featire specs) =======
  67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  68. >>>>>>> 7a02bbe (Featire specs) =======
  69. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  71. =======
  72. >>>>>>> d0dc1f1 (Featire specs) =======
  73. >>>>>>> 752f0c0 (Featire specs) =======
  74. >>>>>>> 4e81ea2 (Featire specs) =======
  75. >>>>>>> 08edf50 (Featire specs) =======
  76. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  77. >>>>>>> 7a02bbe (Featire specs) =======
  78. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end

spec/models/book_spec.rb

100.0% lines covered

16 relevant lines. 16 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe Book, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  3. 1 =======
  4. >>>>>>> d0dc1f1 (Featire specs) =======
  5. >>>>>>> 752f0c0 (Featire specs) =======
  6. >>>>>>> 4e81ea2 (Featire specs) =======
  7. >>>>>>> 08edf50 (Featire specs) =======
  8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  9. >>>>>>> 7a02bbe (Featire specs) =======
  10. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe 'books' do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  11. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) RSpec.describe Book, type: :model do
  12. 1 describe 'books' do
  13. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) context 'when validations' do
  14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  15. 2 it { is_expected.to validate_presence_of(:title) }
  16. 2 it { is_expected.to validate_presence_of(:description) }
  17. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  18. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  19. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:year_of_publication) } ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  20. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:quantity) } ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  21. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:materials) } ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  22. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) }
  23. 2 it { is_expected.to validate_presence_of(:materials) }
  24. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:dimensions) }
  25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  26. =======
  27. >>>>>>> d0dc1f1 (Featire specs) =======
  28. >>>>>>> 752f0c0 (Featire specs) =======
  29. >>>>>>> 4e81ea2 (Featire specs) =======
  30. >>>>>>> 08edf50 (Featire specs) =======
  31. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  32. >>>>>>> 7a02bbe (Featire specs) =======
  33. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  35. =======
  36. >>>>>>> d0dc1f1 (Featire specs) =======
  37. >>>>>>> 752f0c0 (Featire specs) =======
  38. >>>>>>> 4e81ea2 (Featire specs) =======
  39. >>>>>>> 08edf50 (Featire specs) =======
  40. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  41. >>>>>>> 7a02bbe (Featire specs) =======
  42. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  44. =======
  45. >>>>>>> d0dc1f1 (Featire specs) =======
  46. >>>>>>> 752f0c0 (Featire specs) =======
  47. >>>>>>> 4e81ea2 (Featire specs) =======
  48. >>>>>>> 08edf50 (Featire specs) =======
  49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  50. >>>>>>> 7a02bbe (Featire specs) =======
  51. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 context 'when associations' do
  52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  53. =======
  54. >>>>>>> d0dc1f1 (Featire specs) =======
  55. >>>>>>> 752f0c0 (Featire specs) =======
  56. >>>>>>> 4e81ea2 (Featire specs) =======
  57. >>>>>>> 08edf50 (Featire specs) =======
  58. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  59. >>>>>>> 7a02bbe (Featire specs) =======
  60. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  62. =======
  63. >>>>>>> d0dc1f1 (Featire specs) =======
  64. >>>>>>> 752f0c0 (Featire specs) =======
  65. >>>>>>> 4e81ea2 (Featire specs) =======
  66. >>>>>>> 08edf50 (Featire specs) =======
  67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  68. >>>>>>> 7a02bbe (Featire specs) =======
  69. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 it { is_expected.to have_many(:authors).through(:authors_books) }
  70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  71. =======
  72. >>>>>>> d0dc1f1 (Featire specs) =======
  73. >>>>>>> 752f0c0 (Featire specs) =======
  74. >>>>>>> 4e81ea2 (Featire specs) =======
  75. >>>>>>> 08edf50 (Featire specs) =======
  76. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  77. >>>>>>> 7a02bbe (Featire specs) =======
  78. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  79. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  80. =======
  81. >>>>>>> d0dc1f1 (Featire specs) =======
  82. >>>>>>> 752f0c0 (Featire specs) =======
  83. >>>>>>> 4e81ea2 (Featire specs) =======
  84. >>>>>>> 08edf50 (Featire specs) =======
  85. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  86. >>>>>>> 7a02bbe (Featire specs) =======
  87. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  88. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  89. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
  90. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  91. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  92. end
  93. end
  94. end

spec/models/books_category_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe BooksCategory, type: :model do
  2. 1 describe 'books_categories' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:book) }
  5. 2 it { is_expected.to validate_presence_of(:category) }
  6. end
  7. 1 context 'when associations' do
  8. 2 it { is_expected.to belong_to(:category) }
  9. 2 it { is_expected.to belong_to(:book) }
  10. end
  11. end
  12. end

spec/models/category_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Category, type: :model do
  2. 1 describe 'category' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:name) }
  5. end
  6. 1 context 'when associations' do
  7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
  9. end
  10. end
  11. end

spec/models/order_spec.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe Order, type: :model do
  3. 1 describe 'order' do
  4. 1 context 'when associations' do
  5. 2 it { is_expected.to have_many(:order_books).dependent(:destroy) }
  6. 2 it { is_expected.to have_many(:books).through(:order_books) }
  7. end
  8. end
  9. end

spec/models/review_spec.rb

100.0% lines covered

14 relevant lines. 14 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe Review, type: :model do
  3. 1 describe 'review' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:title) }
  6. 2 it { is_expected.to validate_presence_of(:body) }
  7. 2 it { is_expected.to validate_presence_of(:rating) }
  8. 2 it { is_expected.to validate_presence_of(:verified) }
  9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
  10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
  11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
  12. end
  13. 1 context 'when associations' do
  14. 2 it { is_expected.to belong_to(:book) }
  15. 2 it { is_expected.to belong_to(:user) }
  16. end
  17. end
  18. end

spec/models/shipping_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Shipping, type: :model do
  2. 1 describe 'shipping' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
  7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
  8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  11. end
  12. 1 context 'when not validations' do
  13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  20. end
  21. 1 context 'when associations' do
  22. 2 it { is_expected.to belong_to(:user) }
  23. end
  24. end
  25. end

spec/models/user_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe User, type: :model do
  2. 1 describe 'author' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:email) }
  5. 2 it { is_expected.to validate_presence_of(:password) }
  6. end
  7. 1 context 'with associations' do
  8. 2 it { is_expected.to have_one(:billing) }
  9. 2 it { is_expected.to have_one(:shipping) }
  10. end
  11. end
  12. end

spec/queryes/book_query_spec.rb

100.0% lines covered

45 relevant lines. 45 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe BookQuery do
  3. 1 shared_examples 'sort test' do
  4. 5 it 'sort' do
  5. 5 books
  6. 5 expect(test).to eq(result)
  7. end
  8. end
  9. 3 let(:titles) { %w[Adam Zimbabwe] }
  10. 1 let(:books_dates) do
  11. 1 ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
  12. end
  13. 1 describe 'all books sort' do
  14. 1 context 'when sort by title A to Z' do
  15. 1 let(:books) do
  16. 1 create(:book, title: titles.first)
  17. 1 create(:book, title: titles.second)
  18. end
  19. 2 let(:result) { titles.second }
  20. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
  21. 1 include_examples 'sort test'
  22. end
  23. 1 context 'when sort title Z to A' do
  24. 1 let(:books) do
  25. 1 create(:book, title: titles.first)
  26. 1 create(:book, title: titles.second)
  27. end
  28. 2 let(:result) { titles.first }
  29. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
  30. 1 include_examples 'sort test'
  31. end
  32. 1 context 'when sort by price High to Low' do
  33. 1 let(:books) do
  34. 1 create(:book, price_cents: 75)
  35. 1 create(:book, price_cents: 23)
  36. end
  37. 2 let(:result) { 75 }
  38. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
  39. 1 include_examples 'sort test'
  40. end
  41. 1 context 'when sort price Low to High' do
  42. 1 let(:books) do
  43. 1 create(:book, price_cents: 75)
  44. 1 create(:book, price_cents: 23)
  45. end
  46. 2 let(:result) { 23 }
  47. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
  48. 1 include_examples 'sort test'
  49. end
  50. 1 context 'when sort by Newest' do
  51. 1 let(:books) do
  52. 1 create(:book, created_at: books_dates.first)
  53. 1 create(:book, created_at: books_dates.second)
  54. end
  55. 2 let(:result) { books_dates.first }
  56. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
  57. 1 include_examples 'sort test'
  58. end
  59. end
  60. end

spec/support/configs/capybara.rb

100.0% lines covered

19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> 7c4ea7f (Fix)
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe 'Author' do ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  3. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) =======
  4. >>>>>>> 998f08d (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request authentication helper methods' ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) Capybara.configure do |config| >>>>>>> 94841b5 (Featire specs)
  5. 1 config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> 4552227 (Featire specs)
  6. <<<<<<< HEAD <<<<<<< HEAD
  7. =======
  8. >>>>>>> bd8bda4 (Manifest_cache true) =======
  9. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request global before and after hooks'
  10. 2 let(:first_name) { FFaker::Name.first_name }
  11. 2 let(:last_name) { FFaker::Name.last_name }
  12. 2 let(:new_name) { FFaker::Name.first_name }
  13. 2 let(:old_name) { author.first_name }
  14. 4 let(:author) { create(:author) }
  15. 1 before do
  16. 4 sign_in(create(:admin_user), :admin_user)
  17. end
  18. 1 it 'can create an author' do
  19. 1 visit 'admin/authors'
  20. 1 click_link('New Author')
  21. 1 fill_in 'author[first_name]', with: first_name
  22. 1 fill_in 'author[last_name]', with: last_name
  23. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
  24. end
  25. 1 it 'can delete an author' do
  26. 1 author
  27. 1 visit 'admin/authors'
  28. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
  29. end
  30. 1 it 'can view an author' do
  31. 1 author
  32. 1 visit 'admin/authors'
  33. 1 click_link('View')
  34. 1 expect(page).to have_content(author.first_name)
  35. end
  36. 1 it 'can edit an author' do
  37. 1 author
  38. 1 visit 'admin/authors'
  39. 1 click_link('Edit')
  40. 1 fill_in 'author[first_name]', with: new_name
  41. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
  42. end
  43. end

spec/feature/admin/book_spec.rb

100.0% lines covered

43 relevant lines. 43 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 7 let(:book) { create(:book) }
  5. 1 let(:params) do
  6. 1 { title: FFaker::Book.title,
  7. description: FFaker::Book.description,
  8. price_cents: FFaker::Number.rand(1..100),
  9. dimensions: FFaker::Book.cover,
  10. year_of_publication: FFaker::Number.rand(1900..2022),
  11. materials: 'Soft cover',
  12. quantity: FFaker::Number.rand(2..5) }
  13. end
  14. 1 before do
  15. 6 sign_in(create(:admin_user), :admin_user)
  16. 6 book
  17. 6 visit 'admin/books'
  18. end
  19. 1 it 'can create an book' do
  20. 1 click_link('New Book')
  21. 1 fill_in 'book[title]', with: params[:title]
  22. 1 fill_in 'book[description]', with: params[:description]
  23. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
  24. 1 fill_in 'book[price_cents]', with: params[:price_cents]
  25. 1 fill_in 'book[materials]', with: params[:materials]
  26. 1 fill_in 'book[dimensions]', with: params[:dimensions]
  27. 1 fill_in 'book[quantity]', with: params[:quantity]
  28. 1 click_button('Create Book')
  29. 1 expect(page).to have_content(params[:title])
  30. end
  31. 1 it 'can delete an book' do
  32. 1 click_link('Delete')
  33. 1 expect(page).not_to have_content(book.title)
  34. end
  35. 1 it 'can view an book' do
  36. 1 click_link('View')
  37. 1 expect(page).to have_content(book.title)
  38. end
  39. 1 it 'can edit an book' do
  40. 1 click_link('Edit')
  41. 1 fill_in 'book[title]', with: 'New title'
  42. 1 click_button('Update Book')
  43. 1 expect(page).to have_content('New title')
  44. end
  45. 1 context 'when image' do
  46. 1 before do
  47. 2 click_link('Edit')
  48. 2 page.attach_file('book[images][]', './spec/fixtures/Web-Book-Cover.png')
  49. 2 click_on 'Update Book'
  50. end
  51. 1 it 'can add images to book' do
  52. 1 expect(book.reload.images.count).to eq(1)
  53. end
  54. 1 it 'can delete images from book' do
  55. 1 click_link('Edit')
  56. 1 click_link('Delete')
  57. 1 expect(book.reload.images.count).to eq(0)
  58. end
  59. end
  60. end

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Category' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:category_name) { FFaker::Book.genre }
  5. 5 let(:category) { create(:category) }
  6. 1 before do
  7. 4 sign_in(create(:admin_user), :admin_user)
  8. 4 category
  9. 4 visit 'admin/categories'
  10. end
  11. 1 it 'can create an category' do
  12. 1 click_link('New Category')
  13. 1 fill_in 'category[name]', with: category_name
  14. 1 click_button('Create Category')
  15. 1 expect(page).to have_content(category_name)
  16. end
  17. 1 it 'can delete an category' do
  18. 1 click_link('Delete')
  19. 1 expect(page).not_to have_content(category.name)
  20. end
  21. 1 it 'can view an category' do
  22. 1 click_link('View')
  23. 1 expect(page).to have_content(category.name)
  24. end
  25. 1 it 'can edit an category' do
  26. 1 click_link('Edit')
  27. 1 fill_in 'category[name]', with: 'New Genre'
  28. 1 click_button('Update Category')
  29. 1 expect(page).to have_content('New Genre')
  30. end
  31. end

spec/feature/billing_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Billing', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:user) { create(:user) }
  5. 1 let(:attributes_for) { attributes_for(:billing) }
  6. 1 describe '#fill_in', js: true do
  7. 1 it 'fill in billing' do
  8. 1 sign_in(user)
  9. 1 visit edit_user_path(user.id)
  10. 1 within('div#billing.col-md-5.mb-40') do
  11. 1 find_all('div', class: 'form-group')[0] do
  12. fill_in :first_name, with: attributes_for[:first_name]
  13. end
  14. 1 find_all('div', class: 'form-group')[1] do
  15. fill_in :last_name, with: attributes_for[:last_name]
  16. end
  17. 1 find_all('div', class: 'form-group')[2] do
  18. fill_in :address, with: attributes_for[:address]
  19. end
  20. 1 find_all('div', class: 'form-group')[3] do
  21. fill_in :city, with: attributes_for[:city]
  22. end
  23. 1 find_all('div', class: 'form-group')[4] do
  24. fill_in :zip, with: attributes_for[:zip]
  25. end
  26. 1 find_all('div', class: 'form-group')[5] do
  27. fill_in :country, with: attributes_for[:country]
  28. end
  29. 1 find_all('div', class: 'form-group')[6] do
  30. fill_in :phone, with: attributes_for[:phone]
  31. end
  32. 1 click_on I18n.t('settings.save')
  33. end
  34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  35. end
  36. end
  37. end

spec/feature/book_spec.rb

100.0% lines covered

104 relevant lines. 104 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book', type: :feature do
  2. 5 let(:category_one) { create(:category) }
  3. 3 let(:category_two) { create(:category) }
  4. 1 let(:params) do
  5. 4 { title: FFaker::Book.title,
  6. description: FFaker::Book.description,
  7. price_cents: FFaker::Number.rand(1..100),
  8. dimensions: FFaker::Book.cover,
  9. year_of_publication: FFaker::Number.rand(1900..2022),
  10. materials: 'Soft cover',
  11. quantity: FFaker::Number.rand(2..5) }
  12. end
  13. 7 let(:book) { create(:book).decorate }
  14. 1 describe '#show book' do
  15. 1 it 'show books info' do
  16. 1 visit "books/#{book.id}"
  17. 1 expect(page).to have_content(book.title)
  18. end
  19. 1 it 'clicked Beck to results' do
  20. 1 visit "books/#{book.id}"
  21. 1 find('a', class: 'general-back-link').click
  22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
  23. end
  24. 1 context 'when test read more' do
  25. 1 it 'show read more' do
  26. 1 visit "books/#{book.id}"
  27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
  28. end
  29. 1 it 'clicked read more', js: true do
  30. 1 visit "books/#{book.id}"
  31. 1 click_link I18n.t('book_page.read_more')
  32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
  33. end
  34. end
  35. 1 context 'when quantity changes', js: true do
  36. 1 before do
  37. 2 visit "books/#{book.id}"
  38. 2 find('a', class: 'inc').click
  39. end
  40. 1 it 'increase quantity' do
  41. 1 expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
  42. end
  43. 1 it 'decrease quantity' do
  44. 1 find('a', class: 'dec').click
  45. 1 expect(page).to have_content("€#{book.price}")
  46. end
  47. end
  48. end
  49. 1 describe '#catalog' do
  50. 1 describe 'filter by category' do
  51. 1 before do
  52. 2 category_one.books.create(params)
  53. 2 visit books_path
  54. end
  55. 1 after do
  56. 2 category_one.destroy
  57. end
  58. 1 it 'show book count for category' do
  59. 1 expect(page).to have_content(category_one.books.size)
  60. end
  61. 1 it 'filter book by category' do
  62. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
  63. 1 click_on category_one.name
  64. end
  65. 1 expect(page).to have_content(category_one.books.first.title)
  66. end
  67. end
  68. 1 describe 'filter by all books' do
  69. 1 before do
  70. 2 category_one.books.create(params)
  71. 2 category_two.books.create(params)
  72. 2 visit books_path
  73. 2 click_on I18n.t('catalog_page.all')
  74. end
  75. 1 after do
  76. 2 category_one.destroy
  77. 2 category_two.destroy
  78. end
  79. 1 it 'shown books for first category' do
  80. 1 expect(page).to have_content(category_one.books.first.title)
  81. end
  82. 1 it 'shown books for second category' do
  83. 1 expect(page).to have_content(category_two.books.first.title)
  84. end
  85. end
  86. end
  87. 1 describe 'load_more' do
  88. 1 before do
  89. 3 24.times do
  90. 72 books << create(:book)
  91. end
  92. end
  93. 4 let(:books) { [] }
  94. 1 it 'show books without view more button' do
  95. 1 visit books_path
  96. 1 find('a', id: 'view_more', class: 'view_more').click
  97. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
  98. end
  99. 1 context 'when view more' do
  100. 1 it 'show books with view more button' do
  101. 1 visit books_path
  102. 1 expect(page).to have_css('a', class: 'view_more')
  103. end
  104. 1 it 'show loaded books', js: true do
  105. 1 visit books_path
  106. 1 find('a', class: 'view_more').click
  107. 1 expect(page).to have_content(books.last.title)
  108. end
  109. end
  110. end
  111. 1 describe 'sort' do
  112. 1 shared_examples 'sort test' do
  113. 5 it 'sort books' do
  114. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
  115. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
  116. 5 create(:book, title: 'Anna', price_cents: 23,
  117. created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
  118. 5 visit books_path
  119. 5 find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
  120. id: 'menu').click
  121. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
  122. 5 click_link button
  123. end
  124. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
  125. end
  126. end
  127. 1 context 'when sort by title A to Z' do
  128. 2 let(:button) { I18n.t('catalog_page.sorting.title.asc') }
  129. 2 let(:book_title) { 'Anna' }
  130. 1 include_examples 'sort test'
  131. end
  132. 1 context 'when sort by title Z to A' do
  133. 2 let(:button) { I18n.t('catalog_page.sorting.title.desc') }
  134. 2 let(:book_title) { 'Zimbabwe' }
  135. 1 include_examples 'sort test'
  136. end
  137. 1 context 'when sort by price High to Low' do
  138. 2 let(:button) { I18n.t('catalog_page.sorting.price.desc') }
  139. 2 let(:book_title) { 'Zimbabwe' }
  140. 1 include_examples 'sort test'
  141. end
  142. 1 context 'when sort by price Low to High' do
  143. 2 let(:button) { I18n.t('catalog_page.sorting.price.asc') }
  144. 2 let(:book_title) { 'Anna' }
  145. 1 include_examples 'sort test'
  146. end
  147. 1 context 'when sort by newest' do
  148. 2 let(:button) { I18n.t('catalog_page.sorting.newer_first') }
  149. 2 let(:book_title) { 'Zimbabwe' }
  150. 1 include_examples 'sort test'
  151. end
  152. end
  153. end

spec/feature/cart_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe 'Cart', type: :feature, js: true do
  3. 5 let(:book) { FactoryBot.create(:book) }
  4. 1 before do
  5. 4 book
  6. 4 visit book_path(book.id)
  7. 4 click_button I18n.t('book_page.add_to_card')
  8. end
  9. 1 describe '#add_book_to_order' do
  10. 1 it 'add book to order' do
  11. 1 within('span', class: 'shop-icon') do
  12. 1 expect(page).to have_content(1)
  13. end
  14. end
  15. end
  16. 1 describe '#quantity_change' do
  17. 1 it 'book quantity inc' do
  18. 1 visit orders_path
  19. 1 within("a#inc#{book.id}.input-link") do
  20. 1 find('i.fa.fa-plus.line-heaght-40').click
  21. end
  22. 1 sleep(2)
  23. 1 expect(find_field("counter#{book.id}").value).to eq('2')
  24. end
  25. 1 it 'book quantity dec' do
  26. 1 visit orders_path
  27. 1 within("a#dec#{book.id}.input-link") do
  28. 1 find('i.fa.fa-minus.line-heaght-40').click
  29. end
  30. 1 sleep(2)
  31. 1 expect(find_field("counter#{book.id}").value).to eq('0')
  32. end
  33. end
  34. 1 describe '#remove_book_from_cart' do
  35. 1 it 'remove book from cart' do
  36. 1 visit orders_path
  37. 1 find('button.close.general-cart-close').click
  38. 1 expect(page).to have_content(I18n.t('order.messages.delete'))
  39. end
  40. end
  41. end

spec/feature/checkout_spec.rb

100.0% lines covered

36 relevant lines. 36 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 require_relative '../support/shared_context'
  3. 1 RSpec.describe 'Checkout', type: :feature, js: true do
  4. 1 include_context 'with api request authentication helper methods'
  5. 1 include_context 'with api request global before and after hooks'
  6. 4 let(:user) { create(:user) }
  7. 1 describe '#logedis user' do
  8. 1 it 'on click checkout render address page' do
  9. 1 sign_in(user)
  10. 1 visit root_path
  11. 1 find('a.shop-link.pull-right.hidden-xs').click
  12. 1 find('input.btn.btn-default.mb-20.hidden-xs.center-block').click
  13. 1 expect(page).to have_content('Checkout')
  14. end
  15. end
  16. 1 describe '#guest' do
  17. 1 before do
  18. 3 visit root_path
  19. 3 find('a.shop-link.pull-right.hidden-xs').click
  20. 3 find('input.btn.btn-default.mb-20.hidden-xs.center-block').click
  21. end
  22. 1 context 'when has an account' do
  23. 1 it 'continue using account' do
  24. 1 within('form#login') do
  25. 1 fill_in :user_email, with: user.email
  26. 1 fill_in :user_password, with: user.password
  27. 1 click_on I18n.t('checkout.log_in_with_password')
  28. end
  29. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_in'))
  30. end
  31. end
  32. 1 context 'when dont have an account' do
  33. 1 it 'fast registration' do
  34. 1 within('form#fast_reg') do
  35. 1 fill_in :user_email, with: 'test@rspec.com'
  36. 1 click_on I18n.t('checkout.continue')
  37. end
  38. 1 expect(page).to have_content('Checkout')
  39. end
  40. 1 it 'email is already taken' do
  41. 1 within('form#fast_reg') do
  42. 1 fill_in :user_email, with: user.email
  43. 1 click_on I18n.t('checkout.continue')
  44. end
  45. 1 expect(page).to have_content(I18n.t('checkout.error_message'))
  46. end
  47. end
  48. end
  49. end

spec/feature/coupon_spec.rb

100.0% lines covered

30 relevant lines. 30 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 require_relative '../support/shared_context'
  3. 1 RSpec.describe 'Coupon', type: :feature, js: true do
  4. 1 include_context 'with api request authentication helper methods'
  5. 1 include_context 'with api request global before and after hooks'
  6. 5 let(:user) { FactoryBot.create(:user) }
  7. 4 let(:coupon) { FactoryBot.create(:coupon, discount: 0.15) }
  8. 5 let(:order) { FactoryBot.create(:order, user_id: user.id, books_count: 0) }
  9. 5 let(:book) { FactoryBot.create(:book, price_cents: 1234) }
  10. 5 let(:order_book) { FactoryBot.create(:order_book, order: order, book: book) }
  11. 1 before do
  12. 4 sign_in(user)
  13. 4 order
  14. 4 order_book
  15. 4 visit orders_path
  16. end
  17. 1 describe '#valid coupon' do
  18. 1 before do
  19. 3 fill_in 'input', with: coupon.code
  20. 3 click_button I18n.t('order.apply')
  21. end
  22. 1 it 'sub price' do
  23. 1 expect(page).to have_content("SubTotal:\n€ 12.34")
  24. end
  25. 1 it 'use coupon' do
  26. 1 expect(page).to have_content("Coupon:\n€ 1.85")
  27. end
  28. 1 it 'count price with coupon' do
  29. 1 expect(page).to have_content('Order Total: € 10.49')
  30. end
  31. end
  32. 1 describe '#invalid coupon' do
  33. 1 it 'show error message' do
  34. 1 fill_in 'input', with: 'dasdasdqe1243wasad'
  35. 1 click_button I18n.t('order.apply')
  36. 1 expect(page).to have_content(I18n.t('order.coupon.error'))
  37. end
  38. end
  39. end

spec/feature/home_spec.rb

100.0% lines covered

49 relevant lines. 49 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Home', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 1 describe 'Get Started' do
  5. 1 it 'on click move to catalog page' do
  6. 1 visit root_path
  7. 1 click_on 'Get Started'
  8. 1 expect(page).to have_content('Catalog')
  9. end
  10. end
  11. 1 describe 'navbar' do
  12. 2 let(:books_category) { create(:books_category) }
  13. 1 it 'on click home move to root-path' do
  14. 1 visit books_path
  15. 1 find('a', id: 'root').click
  16. 1 expect(page).to have_content('Get Started')
  17. end
  18. 1 it 'on click category name move to root-path with books that belong to this category' do
  19. 1 books_category
  20. 1 visit root_path
  21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
  22. 1 within('ul', id: 'nav') do
  23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
  24. end
  25. 1 expect(page).to have_content(books_category.category.books.first.title)
  26. end
  27. 1 context 'when guest' do
  28. 1 it 'on click login go to login page' do
  29. 1 visit root_path
  30. 1 within 'div', class: 'visible-xs' do
  31. 1 click_link I18n.t('header.log_in')
  32. end
  33. 1 expect(page).to have_content(I18n.t('header.log_in'))
  34. end
  35. 1 it 'on click sing up go to sing up page' do
  36. 1 visit root_path
  37. 1 within 'div', class: 'visible-xs' do
  38. 1 click_link I18n.t('header.sing_up')
  39. end
  40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
  41. end
  42. end
  43. 1 context 'when user', js: true do
  44. 4 let(:user) { create(:user) }
  45. 1 before do
  46. 3 sign_in(user)
  47. end
  48. 1 it 'on click account show settings' do
  49. 1 visit root_path
  50. 1 click_on I18n.t('header.account')
  51. 1 expect(page).to have_content(I18n.t('header.settings'))
  52. end
  53. 1 it 'on click account show log_out' do
  54. 1 visit root_path
  55. 1 click_on I18n.t('header.account')
  56. 1 expect(page).to have_content(I18n.t('header.log_out'))
  57. end
  58. 1 it 'log_out' do
  59. 1 visit root_path
  60. 1 click_on I18n.t('header.account')
  61. 1 click_on(I18n.t('header.log_out'), match: :first)
  62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
  63. end
  64. end
  65. end
  66. end

spec/feature/login_spec.rb

>>>>>>> a5d032d (Fix) 100.0% lines covered

<<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Login', type: :feature do
  2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#login' do
  4. 1 before do
  5. 2 visit new_user_session_path
  6. end
  7. 1 context 'when successfully login' do
  8. 1 it 'login' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: user_second.email
  11. 1 fill_in 'user_password', with: user_second.password
  12. 1 click_on I18n.t('header.log_in')
  13. end
  14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  15. end
  16. end
  17. 1 context 'when unsuccessfully login' do
  18. 1 it 'didn`t login' do
  19. 1 within 'form', class: 'new_user', id: 'new_user' do
  20. 1 fill_in 'user_email', with: user_second.email
  21. 1 fill_in 'user_password', with: 'wrong_password'
  22. 1 click_on I18n.t('header.log_in')
  23. end
  24. 1 expect(page).to have_text 'Invalid Email or password.'
  25. end
  26. end
  27. end
  28. end

spec/feature/new_password_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 require_relative '../rails_helper'
  2. 1 require_relative '../support/shared_context'
  3. 1 RSpec.describe 'New Password', type: :feature do
  4. 3 let(:user) { FactoryBot.create(:user) }
  5. 1 describe '#new_password' do
  6. 1 it 'change password' do
  7. 1 user.reset_password('newPassword', 'newPassword')
  8. 1 expect(user.password).to eq('newPassword')
  9. end
  10. 1 it 'not validate password' do
  11. 1 visit new_user_password_path
  12. 1 fill_in 'email', with: user.email
  13. 1 click_on I18n.t('login.send_instructions')
  14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
  15. end
  16. end
  17. end

spec/feature/registration_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Registration', type: :feature do
  2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#sing_up' do
  4. 1 before do
  5. 3 visit new_user_registration_path
  6. end
  7. 1 context 'when successfully sing_up' do
  8. 1 it 'sing_up users' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
  11. 1 fill_in 'user_password', with: user.password
  12. 1 fill_in 'user_password_confirmation', with: user.password
  13. 1 click_on I18n.t('header.sing_up')
  14. end
  15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  16. end
  17. end
  18. 1 context 'when users is already exits' do
  19. 1 it 'sing_up users' do
  20. 1 within 'form', class: 'new_user', id: 'new_user' do
  21. 1 fill_in 'user_email', with: user.email
  22. 1 fill_in 'user_password', with: user.password
  23. 1 fill_in 'user_password_confirmation', with: user.password
  24. 1 click_on I18n.t('header.sing_up')
  25. end
  26. 1 expect(page).to have_text('Email has already been taken')
  27. end
  28. end
  29. 1 context 'when unsuccessfully sing_up' do
  30. 1 it 'didn`t sing_up' do
  31. 1 within 'form', class: 'new_user', id: 'new_user' do
  32. 1 fill_in 'user_email', with: FFaker::Internet.email
  33. 1 fill_in 'user_password', with: 'password'
  34. 1 fill_in 'user_password_confirmation', with: 'wrong'
  35. 1 click_on I18n.t('header.sing_up')
  36. end
  37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  38. end
  39. end
  40. end
  41. end

spec/feature/review_spec.rb

100.0% lines covered

28 relevant lines. 28 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Review', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 3 let(:user) { create(:user).decorate }
  5. 3 let(:book) { create(:book).decorate }
  6. 1 before do
  7. 2 sign_in(user)
  8. 2 visit book_path(book)
  9. end
  10. 1 shared_examples 'review' do
  11. 2 it 'review' do
  12. 2 find('i', id: rating).click
  13. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
  14. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
  15. 2 click_on I18n.t('review.post')
  16. 2 expect(page).to have_content(result)
  17. end
  18. end
  19. 1 describe '#post review', js: true do
  20. 1 context 'when review posted' do
  21. 2 let(:rating) { "star#{rand(1..5)}" }
  22. 2 let(:title_words) { 3 }
  23. 2 let(:body_words) { 5 }
  24. 2 let(:result) { user.name_or_email }
  25. 1 include_examples 'review'
  26. end
  27. 1 context 'when review not been posted' do
  28. 2 let(:rating) { "star#{rand(1..5)}" }
  29. 2 let(:title_words) { 80 }
  30. 2 let(:body_words) { 30 }
  31. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
  32. 1 include_examples 'review'
  33. end
  34. end
  35. end

spec/feature/settings_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Settings', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 4 let(:user) { create(:user) }
  5. 1 before do
  6. 3 sign_in(user)
  7. 3 visit edit_user_path(user.id)
  8. 3 click_link I18n.t('settings.privacy')
  9. end
  10. 1 describe '#email_change' do
  11. 1 it 'change email' do
  12. 1 within('div', id: 'email') do
  13. 1 fill_in :email, with: FFaker::Internet.email
  14. 1 click_on I18n.t('settings.save')
  15. end
  16. 1 user.confirm
  17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  18. end
  19. end
  20. 1 describe '#password_change' do
  21. 1 context 'when error' do
  22. 1 it 'didnt change password' do
  23. 1 within('div', id: 'password') do
  24. 1 fill_in :current_password, with: user.password
  25. 1 fill_in :password, with: 'newPassword'
  26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
  27. 1 click_on I18n.t('settings.save')
  28. end
  29. 1 user.confirm
  30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
  31. end
  32. end
  33. 1 context 'when successful' do
  34. 1 it 'didnt change password' do
  35. 1 within('div', id: 'password') do
  36. 1 fill_in :current_password, with: user.password
  37. 1 fill_in :password, with: 'newPassword'
  38. 1 fill_in :password_confirmation, with: 'newPassword'
  39. 1 click_on I18n.t('settings.save')
  40. end
  41. 1 user.confirm
  42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
  43. end
  44. end
  45. end
  46. end

spec/feature/shipping_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Shipping', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:user) { FactoryBot.create(:user) }
  5. 1 let(:attributes_for) { attributes_for(:shipping) }
  6. 1 describe '#fill_in', js: true do
  7. 1 it 'fill in shipping' do
  8. 1 sign_in(user)
  9. 1 visit edit_user_path(user.id)
  10. 1 within('div#shipping.col-md-5.mb-40') do
  11. 1 find_all('div', class: 'form-group')[0] do
  12. fill_in :first_name, with: attributes_for[:first_name]
  13. end
  14. 1 find_all('div', class: 'form-group')[1] do
  15. fill_in :last_name, with: attributes_for[:last_name]
  16. end
  17. 1 find_all('div', class: 'form-group')[2] do
  18. fill_in :address, with: attributes_for[:address]
  19. end
  20. 1 find_all('div', class: 'form-group')[3] do
  21. fill_in :city, with: attributes_for[:city]
  22. end
  23. 1 find_all('div', class: 'form-group')[4] do
  24. fill_in :zip, with: attributes_for[:zip]
  25. end
  26. 1 find_all('div', class: 'form-group')[5] do
  27. fill_in :country, with: attributes_for[:country]
  28. end
  29. 1 find_all('div', class: 'form-group')[6] do
  30. fill_in :phone, with: attributes_for[:phone]
  31. end
  32. 1 click_on I18n.t('settings.save')
  33. end
  34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  35. end
  36. end
  37. end

spec/feature/user_spec.rb

100.0% lines covered

42 relevant lines. 42 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'User', type: :feature do
  2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
  3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
  4. 1 describe '#sing_up' do
  5. 1 context 'when successfully sing_up' do
  6. 1 before do
  7. 1 visit new_user_registration_path
  8. 1 within 'form', class: 'new_user', id: 'new_user' do
  9. 1 fill_in 'user_email', with: user.email
  10. 1 fill_in 'user_password', with: user.password
  11. 1 fill_in 'user_password_confirmation', with: user.password
  12. 1 click_on I18n.t('header.sing_up')
  13. end
  14. end
  15. 1 it 'sing_up user' do
  16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  17. end
  18. end
  19. 1 context 'when unsuccessfully sing_up' do
  20. 1 it 'didn`t sing_up' do
  21. 1 visit new_user_registration_path
  22. 1 within 'form', class: 'new_user', id: 'new_user' do
  23. 1 fill_in 'user_email', with: FFaker::Internet.email
  24. 1 fill_in 'user_password', with: 'wrong'
  25. 1 fill_in 'user_password_confirmation', with: 'wrong'
  26. 1 click_on I18n.t('header.sing_up')
  27. end
  28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  29. end
  30. end
  31. end
  32. 1 describe '#login' do
  33. 1 before do
  34. 2 user_second.confirm
  35. end
  36. 1 context 'when successfully login' do
  37. 1 it 'login' do
  38. 1 visit new_user_session_path
  39. 1 within 'form', class: 'new_user', id: 'new_user' do
  40. 1 fill_in 'user_email', with: user_second.email
  41. 1 fill_in 'user_password', with: user_second.password
  42. 1 click_on I18n.t('header.log_in')
  43. end
  44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  45. end
  46. end
  47. 1 context 'when unsuccessfully login' do
  48. 1 it 'didn`t login' do
  49. 1 visit new_user_session_path
  50. 1 within 'form', class: 'new_user', id: 'new_user' do
  51. 1 fill_in 'user_email', with: user_second.email
  52. 1 fill_in 'user_password', with: 'wrong_password'
  53. 1 click_on I18n.t('header.log_in')
  54. end
  55. 1 expect(page).to have_text 'Invalid Email or password.'
  56. end
  57. end
  58. end
  59. end

spec/models/admin_user_spec.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AdminUser, type: :model do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:email) }
  5. 2 it { is_expected.to validate_presence_of(:password) }
  6. end
  7. end

spec/models/author_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Author, type: :model do
  2. 1 describe 'author' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:first_name) }
  5. 2 it { is_expected.to validate_presence_of(:last_name) }
  6. end
  7. 1 context 'when associations' do
  8. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  9. 2 it { is_expected.to have_many(:books).through(:authors_books) }
  10. end
  11. end
  12. end

spec/models/authors_book_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe AuthorsBook, type: :model do
  2. 1 describe 'authors_book' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:book) }
  5. 2 it { is_expected.to validate_presence_of(:author) }
  6. end
  7. 1 context 'when associations' do
  8. 2 it { is_expected.to belong_to(:author) }
  9. 2 it { is_expected.to belong_to(:book) }
  10. end
  11. end
  12. end

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Billing, type: :model do
  2. 1 describe 'billing' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
  7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
  8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  11. end
  12. 1 context 'when not validations' do
  13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  20. end
  21. 1 context 'when associations' do
  22. 2 it { is_expected.to belong_to(:user) }
  23. end
  24. end
  25. end

spec/models/book_spec.rb

100.0% lines covered

16 relevant lines. 16 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Book, type: :model do
  2. 1 describe 'books' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:title) }
  5. 2 it { is_expected.to validate_presence_of(:description) }
  6. 2 it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
  7. 2 it { is_expected.to validate_presence_of(:year_of_publication) }
  8. 2 it { is_expected.to validate_presence_of(:quantity) }
  9. 2 it { is_expected.to validate_presence_of(:materials) }
  10. 2 it { is_expected.to validate_presence_of(:dimensions) }
  11. end
  12. 1 context 'when associations' do
  13. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  14. 2 it { is_expected.to have_many(:authors).through(:authors_books) }
  15. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  16. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
  17. 2 it { is_expected.to have_many(:reviews).dependent(:destroy) }
  18. end
  19. end
  20. end

spec/models/books_category_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe BooksCategory, type: :model do
  2. 1 describe 'books_categories' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:book) }
  5. 2 it { is_expected.to validate_presence_of(:category) }
  6. end
  7. 1 context 'when associations' do
  8. 2 it { is_expected.to belong_to(:category) }
  9. 2 it { is_expected.to belong_to(:book) }
  10. end
  11. end
  12. end

spec/models/category_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Category, type: :model do
  2. 1 describe 'category' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:name) }
  5. end
  6. 1 context 'when associations' do
  7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
  9. end
  10. end
  11. end

spec/models/order_spec.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe Order, type: :model do
  3. 1 describe 'order' do
  4. 1 context 'when associations' do
  5. 2 it { is_expected.to have_many(:order_books).dependent(:destroy) }
  6. 2 it { is_expected.to have_many(:books).through(:order_books) }
  7. end
  8. end
  9. end

spec/models/review_spec.rb

100.0% lines covered

14 relevant lines. 14 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe Review, type: :model do ======= RSpec.describe BooksCategory, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe 'review' do ======= describe 'books_categories' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'books_categories' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  4. 1 context 'when validations' do
  5. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:title) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  6. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:body) }
  7. 2 it { is_expected.to validate_presence_of(:rating) }
  8. 2 it { is_expected.to validate_presence_of(:verified) }
  9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
  10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
  11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
  12. end
  13. 1 context 'when associations' do
  14. 2 it { is_expected.to belong_to(:book) }
  15. 2 it { is_expected.to belong_to(:user) }
  16. end
  17. end
  18. end

spec/models/shipping_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Shipping, type: :model do
  2. 1 describe 'shipping' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
  7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
  8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  11. end
  12. 1 context 'when not validations' do
  13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  20. end
  21. 1 context 'when associations' do
  22. 2 it { is_expected.to belong_to(:user) }
  23. end
  24. end
  25. end

spec/models/user_spec.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe User, type: :model do
  2. 1 let(:user) { FactoryBot.create(:user) }
  3. 1 describe 'author' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:email) }
  6. 2 it { is_expected.to validate_presence_of(:password) } ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  7. end
  8. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD context 'with associations' do ======= context 'when associations' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when associations' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  9. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to have_one(:billing) } ======= it { is_expected.to belong_to(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  10. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to have_one(:shipping) } ======= it { is_expected.to belong_to(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  11. end
  12. end
  13. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD

spec/queryes/book_query_spec.rb

=======

spec/models/category_spec.rb

>>>>>>> d0dc1f1 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 752f0c0 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 4e81ea2 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 08edf50 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======

spec/models/category_spec.rb

>>>>>>> 7a02bbe (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> bf5c79b (Fix book_spec decrease quantity and price)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 45 relevant lines. 45 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> d0dc1f1 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 752f0c0 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe BookQuery do ======= RSpec.describe Category, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD shared_examples 'sort test' do ======= describe 'category' do >>>>>>> d0dc1f1 (Featire specs) ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'category' do >>>>>>> 4e81ea2 (Featire specs) ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  5. 5 =======
  6. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  7. 1 >>>>>>> 752f0c0 (Featire specs) =======
  8. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  9. 1 >>>>>>> 08edf50 (Featire specs) =======
  10. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  11. 1 >>>>>>> 7a02bbe (Featire specs) =======
  12. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'sort' do ======= context 'when validations' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when validations' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  14. 5 =======
  15. 2 >>>>>>> d0dc1f1 (Featire specs) =======
  16. 2 >>>>>>> 752f0c0 (Featire specs) =======
  17. 2 >>>>>>> 4e81ea2 (Featire specs) =======
  18. 2 >>>>>>> 08edf50 (Featire specs) =======
  19. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  20. 2 >>>>>>> 7a02bbe (Featire specs) =======
  21. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD books ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  23. 5 expect(test).to eq(result)
  24. =======
  25. >>>>>>> d0dc1f1 (Featire specs) =======
  26. >>>>>>> 752f0c0 (Featire specs) =======
  27. >>>>>>> 4e81ea2 (Featire specs) =======
  28. >>>>>>> 08edf50 (Featire specs) =======
  29. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  30. >>>>>>> 7a02bbe (Featire specs) =======
  31. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  32. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  33. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  34. 1 context 'when associations' do
  35. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  36. 2 it { is_expected.to have_many(:books).through(:books_categories) }
  37. end
  38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  39. <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  40. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages)

spec/models/user_spec.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe User, type: :model do
  3. 1 pending "add some examples to (or delete) #{__FILE__}"
  4. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) ======= >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)

spec/rails_helper.rb

87.5% lines covered

16 relevant lines. 14 lines covered and 2 lines missed.
    
  1. 1 require 'spec_helper'
  2. 1 ENV['RAILS_ENV'] ||= 'test'
  3. 1 require_relative '../config/environment'
  4. 1 abort('The Rails environment is running in production mode!') if Rails.env.production?
  5. 1 require 'rspec/rails'
  6. 1 require 'shoulda-matchers'
  7. 1 require_relative 'support/configs/shoulda_matcher'
  8. 1 require_relative 'support/configs/capybara'
  9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs)
  10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  11. 3 =======
  12. >>>>>>> d0dc1f1 (Featire specs) =======
  13. >>>>>>> 752f0c0 (Featire specs) =======
  14. >>>>>>> 4e81ea2 (Featire specs) =======
  15. >>>>>>> 08edf50 (Featire specs) =======
  16. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:titles) { %w[Adam Zimbabwe] } ======= begin >>>>>>> d0dc1f1 (Featire specs) ======= begin >>>>>>> 752f0c0 (Featire specs) ======= begin >>>>>>> 4e81ea2 (Featire specs) ======= begin >>>>>>> 08edf50 (Featire specs) ======= begin >>>>>>> 7a02bbe (Featire specs)
  17. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:books_dates) do ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> d0dc1f1 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4e81ea2 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs)
  18. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  19. 1 =======
  20. >>>>>>> d0dc1f1 (Featire specs) =======
  21. >>>>>>> 752f0c0 (Featire specs) =======
  22. >>>>>>> 4e81ea2 (Featire specs) =======
  23. >>>>>>> 08edf50 (Featire specs) =======
  24. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> d0dc1f1 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4e81ea2 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs)
  25. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  26. =======
  27. >>>>>>> d0dc1f1 (Featire specs) =======
  28. >>>>>>> 752f0c0 (Featire specs) =======
  29. >>>>>>> 4e81ea2 (Featire specs) =======
  30. >>>>>>> 08edf50 (Featire specs) =======
  31. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= puts e.to_s.strip >>>>>>> d0dc1f1 (Featire specs) ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) ======= puts e.to_s.strip >>>>>>> 4e81ea2 (Featire specs) ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs)
  32. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  33. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
  34. exit 1
  35. end
  36. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
  37. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  38. 1 describe 'all books sort' do
  39. 1 context 'when sort by title A to Z' do
  40. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs)
  41. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:books) do ======= RSpec.configure do |config| >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs)
  42. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:book, title: titles.first) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> d0dc1f1 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4e81ea2 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs)
  43. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:book, title: titles.second) ======= config.use_transactional_fixtures = true >>>>>>> d0dc1f1 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 4e81ea2 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs)
  44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  45. end
  46. 2 let(:result) { titles.second }
  47. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
  48. =======
  49. >>>>>>> d0dc1f1 (Featire specs) =======
  50. >>>>>>> 752f0c0 (Featire specs) =======
  51. >>>>>>> 4e81ea2 (Featire specs) =======
  52. >>>>>>> 08edf50 (Featire specs) =======
  53. >>>>>>> 7a02bbe (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD include_examples 'sort test' ======= config.infer_spec_type_from_file_location! >>>>>>> d0dc1f1 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 4e81ea2 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs)
  54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  55. end
  56. =======
  57. >>>>>>> d0dc1f1 (Featire specs) =======
  58. >>>>>>> 752f0c0 (Featire specs) =======
  59. >>>>>>> 4e81ea2 (Featire specs) =======
  60. >>>>>>> 08edf50 (Featire specs) =======
  61. >>>>>>> 7a02bbe (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD context 'when sort title Z to A' do ======= config.filter_rails_from_backtrace! >>>>>>> d0dc1f1 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 4e81ea2 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs)
  62. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  63. 1 let(:books) do
  64. 1 create(:book, title: titles.first)
  65. 1 create(:book, title: titles.second)
  66. end
  67. 2 let(:result) { titles.first }
  68. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
  69. 1 include_examples 'sort test'
  70. end
  71. 1 context 'when sort by price High to Low' do
  72. 1 let(:books) do
  73. 1 create(:book, price_cents: 75)
  74. 1 create(:book, price_cents: 23)
  75. end
  76. 2 let(:result) { 75 }
  77. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
  78. 1 include_examples 'sort test'
  79. end
  80. 1 context 'when sort price Low to High' do
  81. 1 let(:books) do
  82. 1 create(:book, price_cents: 75)
  83. 1 create(:book, price_cents: 23)
  84. end
  85. 2 let(:result) { 23 }
  86. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
  87. 1 include_examples 'sort test'
  88. end
  89. 1 context 'when sort by Newest' do
  90. 1 let(:books) do
  91. 1 create(:book, created_at: books_dates.first)
  92. 1 create(:book, created_at: books_dates.second)
  93. end
  94. 2 let(:result) { books_dates.first }
  95. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
  96. 1 include_examples 'sort test'
  97. end
  98. end
  99. =======
  100. >>>>>>> d0dc1f1 (Featire specs) =======
  101. >>>>>>> 752f0c0 (Featire specs) =======
  102. >>>>>>> 4e81ea2 (Featire specs) =======
  103. >>>>>>> 08edf50 (Featire specs) =======
  104. >>>>>>> 7a02bbe (Featire specs) end

spec/support/configs/capybara.rb

<<<<<<< HEAD 100.0% ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) 36.84% ======= <<<<<<< HEAD 100.0% ======= 36.84% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= 36.84% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= 36.84% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> c033601 (Rebased) ======= 36.84% >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) lines covered

19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed. ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 4e7b845 (Manifest_cache true) ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> 7c4ea7f (Fix)
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe 'Author' do ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  3. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) =======
  4. >>>>>>> 998f08d (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request authentication helper methods' ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) Capybara.configure do |config| >>>>>>> 94841b5 (Featire specs)
  5. 1 config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> 4552227 (Featire specs)
  6. <<<<<<< HEAD <<<<<<< HEAD
  7. =======
  8. >>>>>>> bd8bda4 (Manifest_cache true) =======
  9. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request global before and after hooks'
  10. 2 let(:first_name) { FFaker::Name.first_name }
  11. 2 let(:last_name) { FFaker::Name.last_name }
  12. 2 let(:new_name) { FFaker::Name.first_name }
  13. 2 let(:old_name) { author.first_name }
  14. 4 let(:author) { create(:author) }
  15. 1 before do
  16. 4 sign_in(create(:admin_user), :admin_user)
  17. end
  18. 1 it 'can create an author' do
  19. 1 visit 'admin/authors'
  20. 1 click_link('New Author')
  21. 1 fill_in 'author[first_name]', with: first_name
  22. 1 fill_in 'author[last_name]', with: last_name
  23. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
  24. end
  25. 1 it 'can delete an author' do
  26. 1 author
  27. 1 visit 'admin/authors'
  28. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
  29. end
  30. 1 it 'can view an author' do
  31. 1 author
  32. 1 visit 'admin/authors'
  33. 1 click_link('View')
  34. 1 expect(page).to have_content(author.first_name)
  35. end
  36. 1 it 'can edit an author' do
  37. 1 author
  38. 1 visit 'admin/authors'
  39. 1 click_link('Edit')
  40. 1 fill_in 'author[first_name]', with: new_name
  41. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
  42. end
  43. end

spec/feature/admin/book_spec.rb

100.0% lines covered

43 relevant lines. 43 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 7 let(:book) { create(:book) }
  5. 1 let(:params) do
  6. 1 { title: FFaker::Book.title,
  7. description: FFaker::Book.description,
  8. price_cents: FFaker::Number.rand(1..100),
  9. dimensions: FFaker::Book.cover,
  10. year_of_publication: FFaker::Number.rand(1900..2022),
  11. materials: 'Soft cover',
  12. quantity: FFaker::Number.rand(2..5) }
  13. end
  14. 1 before do
  15. 6 sign_in(create(:admin_user), :admin_user)
  16. 6 book
  17. 6 visit 'admin/books'
  18. end
  19. 1 it 'can create an book' do
  20. 1 click_link('New Book')
  21. 1 fill_in 'book[title]', with: params[:title]
  22. 1 fill_in 'book[description]', with: params[:description]
  23. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
  24. 1 fill_in 'book[price_cents]', with: params[:price_cents]
  25. 1 fill_in 'book[materials]', with: params[:materials]
  26. 1 fill_in 'book[dimensions]', with: params[:dimensions]
  27. 1 fill_in 'book[quantity]', with: params[:quantity]
  28. 1 click_button('Create Book')
  29. 1 expect(page).to have_content(params[:title])
  30. end
  31. 1 it 'can delete an book' do
  32. 1 click_link('Delete')
  33. 1 expect(page).not_to have_content(book.title)
  34. end
  35. 1 it 'can view an book' do
  36. 1 click_link('View')
  37. 1 expect(page).to have_content(book.title)
  38. end
  39. 1 it 'can edit an book' do
  40. 1 click_link('Edit')
  41. 1 fill_in 'book[title]', with: 'New title'
  42. 1 click_button('Update Book')
  43. 1 expect(page).to have_content('New title')
  44. end
  45. 1 context 'when image' do
  46. 1 before do
  47. 2 click_link('Edit')
  48. 2 page.attach_file('book[images][]', './spec/fixtures/Web-Book-Cover.png')
  49. 2 click_on 'Update Book'
  50. end
  51. 1 it 'can add images to book' do
  52. 1 expect(book.reload.images.count).to eq(1)
  53. end
  54. 1 it 'can delete images from book' do
  55. 1 click_link('Edit')
  56. 1 click_link('Delete')
  57. 1 expect(book.reload.images.count).to eq(0)
  58. end
  59. end
  60. end

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Category' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:category_name) { FFaker::Book.genre }
  5. 5 let(:category) { create(:category) }
  6. 1 before do
  7. 4 sign_in(create(:admin_user), :admin_user)
  8. 4 category
  9. 4 visit 'admin/categories'
  10. end
  11. 1 it 'can create an category' do
  12. 1 click_link('New Category')
  13. 1 fill_in 'category[name]', with: category_name
  14. 1 click_button('Create Category')
  15. 1 expect(page).to have_content(category_name)
  16. end
  17. 1 it 'can delete an category' do
  18. 1 click_link('Delete')
  19. 1 expect(page).not_to have_content(category.name)
  20. end
  21. 1 it 'can view an category' do
  22. 1 click_link('View')
  23. 1 expect(page).to have_content(category.name)
  24. end
  25. 1 it 'can edit an category' do
  26. 1 click_link('Edit')
  27. 1 fill_in 'category[name]', with: 'New Genre'
  28. 1 click_button('Update Category')
  29. 1 expect(page).to have_content('New Genre')
  30. end
  31. end

spec/feature/billing_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Billing', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:user) { create(:user) }
  5. 1 let(:attributes_for) { attributes_for(:billing) }
  6. 1 describe '#fill_in', js: true do
  7. 1 it 'fill in billing' do
  8. 1 sign_in(user)
  9. 1 visit edit_user_path(user.id)
  10. 1 within('div#billing.col-md-5.mb-40') do
  11. 1 find_all('div', class: 'form-group')[0] do
  12. fill_in :first_name, with: attributes_for[:first_name]
  13. end
  14. 1 find_all('div', class: 'form-group')[1] do
  15. fill_in :last_name, with: attributes_for[:last_name]
  16. end
  17. 1 find_all('div', class: 'form-group')[2] do
  18. fill_in :address, with: attributes_for[:address]
  19. end
  20. 1 find_all('div', class: 'form-group')[3] do
  21. fill_in :city, with: attributes_for[:city]
  22. end
  23. 1 find_all('div', class: 'form-group')[4] do
  24. fill_in :zip, with: attributes_for[:zip]
  25. end
  26. 1 find_all('div', class: 'form-group')[5] do
  27. fill_in :country, with: attributes_for[:country]
  28. end
  29. 1 find_all('div', class: 'form-group')[6] do
  30. fill_in :phone, with: attributes_for[:phone]
  31. end
  32. 1 click_on I18n.t('settings.save')
  33. end
  34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  35. end
  36. end
  37. end

spec/feature/book_spec.rb

100.0% lines covered

104 relevant lines. 104 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book', type: :feature do
  2. 5 let(:category_one) { create(:category) }
  3. 3 let(:category_two) { create(:category) }
  4. 1 let(:params) do
  5. 4 { title: FFaker::Book.title,
  6. description: FFaker::Book.description,
  7. price_cents: FFaker::Number.rand(1..100),
  8. dimensions: FFaker::Book.cover,
  9. year_of_publication: FFaker::Number.rand(1900..2022),
  10. materials: 'Soft cover',
  11. quantity: FFaker::Number.rand(2..5) }
  12. end
  13. 7 let(:book) { create(:book).decorate }
  14. 1 describe '#show book' do
  15. 1 it 'show books info' do
  16. 1 visit "books/#{book.id}"
  17. 1 expect(page).to have_content(book.title)
  18. end
  19. 1 it 'clicked Beck to results' do
  20. 1 visit "books/#{book.id}"
  21. 1 find('a', class: 'general-back-link').click
  22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
  23. end
  24. 1 context 'when test read more' do
  25. 1 it 'show read more' do
  26. 1 visit "books/#{book.id}"
  27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
  28. end
  29. 1 it 'clicked read more', js: true do
  30. 1 visit "books/#{book.id}"
  31. 1 click_link I18n.t('book_page.read_more')
  32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
  33. end
  34. end
  35. 1 context 'when quantity changes', js: true do
  36. 1 before do
  37. 2 visit "books/#{book.id}"
  38. 2 find('a', class: 'inc').click
  39. end
  40. 1 it 'increase quantity' do
  41. 1 expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
  42. end
  43. 1 it 'decrease quantity' do
  44. 1 find('a', class: 'dec').click
  45. 1 expect(page).to have_content("€#{book.price}")
  46. end
  47. end
  48. end
  49. 1 describe '#catalog' do
  50. 1 describe 'filter by category' do
  51. 1 before do
  52. 2 category_one.books.create(params)
  53. 2 visit books_path
  54. end
  55. 1 after do
  56. 2 category_one.destroy
  57. end
  58. 1 it 'show book count for category' do
  59. 1 expect(page).to have_content(category_one.books.size)
  60. end
  61. 1 it 'filter book by category' do
  62. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
  63. 1 click_on category_one.name
  64. end
  65. 1 expect(page).to have_content(category_one.books.first.title)
  66. end
  67. end
  68. 1 describe 'filter by all books' do
  69. 1 before do
  70. 2 category_one.books.create(params)
  71. 2 category_two.books.create(params)
  72. 2 visit books_path
  73. 2 click_on I18n.t('catalog_page.all')
  74. end
  75. 1 after do
  76. 2 category_one.destroy
  77. 2 category_two.destroy
  78. end
  79. 1 it 'shown books for first category' do
  80. 1 expect(page).to have_content(category_one.books.first.title)
  81. end
  82. 1 it 'shown books for second category' do
  83. 1 expect(page).to have_content(category_two.books.first.title)
  84. end
  85. end
  86. end
  87. 1 describe 'load_more' do
  88. 1 before do
  89. 3 24.times do
  90. 72 books << create(:book)
  91. end
  92. end
  93. 4 let(:books) { [] }
  94. 1 it 'show books without view more button' do
  95. 1 visit books_path
  96. 1 find('a', id: 'view_more', class: 'view_more').click
  97. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
  98. end
  99. 1 context 'when view more' do
  100. 1 it 'show books with view more button' do
  101. 1 visit books_path
  102. 1 expect(page).to have_css('a', class: 'view_more')
  103. end
  104. 1 it 'show loaded books', js: true do
  105. 1 visit books_path
  106. 1 find('a', class: 'view_more').click
  107. 1 expect(page).to have_content(books.last.title)
  108. end
  109. end
  110. end
  111. 1 describe 'sort' do
  112. 1 shared_examples 'sort test' do
  113. 5 it 'sort books' do
  114. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
  115. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
  116. 5 create(:book, title: 'Anna', price_cents: 23,
  117. created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
  118. 5 visit books_path
  119. 5 find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
  120. id: 'menu').click
  121. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
  122. 5 click_link button
  123. end
  124. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
  125. end
  126. end
  127. 1 context 'when sort by title A to Z' do
  128. 2 let(:button) { I18n.t('catalog_page.sorting.title.asc') }
  129. 2 let(:book_title) { 'Anna' }
  130. 1 include_examples 'sort test'
  131. end
  132. 1 context 'when sort by title Z to A' do
  133. 2 let(:button) { I18n.t('catalog_page.sorting.title.desc') }
  134. 2 let(:book_title) { 'Zimbabwe' }
  135. 1 include_examples 'sort test'
  136. end
  137. 1 context 'when sort by price High to Low' do
  138. 2 let(:button) { I18n.t('catalog_page.sorting.price.desc') }
  139. 2 let(:book_title) { 'Zimbabwe' }
  140. 1 include_examples 'sort test'
  141. end
  142. 1 context 'when sort by price Low to High' do
  143. 2 let(:button) { I18n.t('catalog_page.sorting.price.asc') }
  144. 2 let(:book_title) { 'Anna' }
  145. 1 include_examples 'sort test'
  146. end
  147. 1 context 'when sort by newest' do
  148. 2 let(:button) { I18n.t('catalog_page.sorting.newer_first') }
  149. 2 let(:book_title) { 'Zimbabwe' }
  150. 1 include_examples 'sort test'
  151. end
  152. end
  153. end

spec/feature/cart_spec.rb

100.0% lines covered

26 relevant lines. 26 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Cart', type: :feature, js: true do
  2. 5 let(:book) { create(:book) }
  3. 1 before do
  4. 4 book
  5. 4 visit book_path(book.id)
  6. 4 click_button I18n.t('book_page.add_to_card')
  7. 4 find('a.shop-link.pull-right.hidden-xs').click
  8. end
  9. 1 describe '#add_book_to_order' do
  10. 1 it 'add book to order' do
  11. 1 within('a.shop-link.pull-right.hidden-xs') do
  12. 1 expect(page).to have_content(1)
  13. end
  14. end
  15. end
  16. 1 describe '#quantity_change' do
  17. 1 it 'book quantity inc' do
  18. 1 within("a#inc#{book.id}.input-link") do
  19. 1 find('i.fa.fa-plus.line-heaght-40').click
  20. end
  21. 1 sleep(2)
  22. 1 expect(find_field("counter#{book.id}").value).to eq('2')
  23. end
  24. 1 it 'book quantity dec' do
  25. 1 within("a#dec#{book.id}.input-link") do
  26. 1 find('i.fa.fa-minus.line-heaght-40').click
  27. end
  28. 1 sleep(2)
  29. 1 expect(find_field("counter#{book.id}").value).to eq('0')
  30. end
  31. end
  32. 1 describe '#remove_book_from_cart' do
  33. 1 it 'remove book from cart' do
  34. 1 find('button.close.general-cart-close').click
  35. 1 expect(page).to have_content(I18n.t('order.messages.delete'))
  36. end
  37. end
  38. end

spec/feature/checkout_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Checkout', type: :feature, js: true do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 4 let(:user) { create(:user) }
  5. 1 describe '#loggedin user' do
  6. 1 it 'on click checkout render address page' do
  7. 1 sign_in(user)
  8. 1 visit root_path
  9. 1 find('a.shop-link.pull-right.hidden-xs').click
  10. 1 find('a#checkout_button.btn.btn-default.hidden-xs').click
  11. 1 expect(page).to have_content('Checkout')
  12. end
  13. end
  14. 1 describe '#guest' do
  15. 1 before do
  16. 3 visit root_path
  17. 3 find('a.shop-link.pull-right.hidden-xs').click
  18. 3 find('input.btn.btn-default.mb-20.hidden-xs.center-block').click
  19. end
  20. 1 context 'when has an account' do
  21. 1 it 'continue using account' do
  22. 1 within('form#login') do
  23. 1 fill_in :user_email, with: user.email
  24. 1 fill_in :user_password, with: user.password
  25. 1 click_on I18n.t('checkout.log_in_with_password')
  26. end
  27. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_in'))
  28. end
  29. end
  30. 1 context 'when dont have an account' do
  31. 1 it 'fast registration' do
  32. 1 within('form#fast_reg') do
  33. 1 fill_in :user_email, with: 'test@rspec.com'
  34. 1 click_on I18n.t('checkout.continue')
  35. end
  36. 1 expect(page).to have_content('Checkout')
  37. end
  38. 1 it 'email is already taken' do
  39. 1 within('form#fast_reg') do
  40. 1 fill_in :user_email, with: user.email
  41. 1 click_on I18n.t('checkout.continue')
  42. end
  43. 1 expect(page).to have_content(I18n.t('checkout.error_message'))
  44. end
  45. end
  46. end
  47. end

spec/feature/coupon_spec.rb

100.0% lines covered

28 relevant lines. 28 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Coupon', type: :feature, js: true do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 5 let(:user) { create(:user) }
  5. 4 let(:coupon) { create(:coupon, discount: 0.15) }
  6. 5 let(:order) { create(:order, user_id: user.id, books_count: 0) }
  7. 5 let(:book) { create(:book, price_cents: 1234) }
  8. 5 let(:order_book) { create(:order_book, order: order, book: book) }
  9. 1 before do
  10. 4 sign_in(user)
  11. 4 order
  12. 4 order_book
  13. 4 visit order_path(order.id)
  14. end
  15. 1 describe '#valid coupon' do
  16. 1 before do
  17. 3 fill_in 'input', with: coupon.code
  18. 3 click_button I18n.t('order.apply')
  19. end
  20. 1 it 'sub price' do
  21. 1 expect(page).to have_content("SubTotal:\n€ 12.34")
  22. end
  23. 1 it 'use coupon' do
  24. 1 expect(page).to have_content("Coupon:\n€ 1.85")
  25. end
  26. 1 it 'count price with coupon' do
  27. 1 expect(page).to have_content('Order Total: € 10.49')
  28. end
  29. end
  30. 1 describe '#invalid coupon' do
  31. 1 it 'show error message' do
  32. 1 fill_in 'input', with: 'dasdasdqe1243wasad'
  33. 1 click_button I18n.t('order.apply')
  34. 1 expect(page).to have_content(I18n.t('order.coupon.error'))
  35. end
  36. end
  37. end

spec/feature/home_spec.rb

100.0% lines covered

49 relevant lines. 49 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Home', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 1 describe 'Get Started' do
  5. 1 it 'on click move to catalog page' do
  6. 1 visit root_path
  7. 1 click_on 'Get Started'
  8. 1 expect(page).to have_content('Catalog')
  9. end
  10. end
  11. 1 describe 'navbar' do
  12. 2 let(:books_category) { create(:books_category) }
  13. 1 it 'on click home move to root-path' do
  14. 1 visit books_path
  15. 1 find('a', id: 'root').click
  16. 1 expect(page).to have_content('Get Started')
  17. end
  18. 1 it 'on click category name move to root-path with books that belong to this category' do
  19. 1 books_category
  20. 1 visit root_path
  21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
  22. 1 within('ul', id: 'nav') do
  23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
  24. end
  25. 1 expect(page).to have_content(books_category.category.books.first.title)
  26. end
  27. 1 context 'when guest' do
  28. 1 it 'on click login go to login page' do
  29. 1 visit root_path
  30. 1 within 'div', class: 'visible-xs' do
  31. 1 click_link I18n.t('header.log_in')
  32. end
  33. 1 expect(page).to have_content(I18n.t('header.log_in'))
  34. end
  35. 1 it 'on click sing up go to sing up page' do
  36. 1 visit root_path
  37. 1 within 'div', class: 'visible-xs' do
  38. 1 click_link I18n.t('header.sing_up')
  39. end
  40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
  41. end
  42. end
  43. 1 context 'when user', js: true do
  44. 4 let(:user) { create(:user) }
  45. 1 before do
  46. 3 sign_in(user)
  47. end
  48. 1 it 'on click account show settings' do
  49. 1 visit root_path
  50. 1 click_on I18n.t('header.account')
  51. 1 expect(page).to have_content(I18n.t('header.settings'))
  52. end
  53. 1 it 'on click account show log_out' do
  54. 1 visit root_path
  55. 1 click_on I18n.t('header.account')
  56. 1 expect(page).to have_content(I18n.t('header.log_out'))
  57. end
  58. 1 it 'log_out' do
  59. 1 visit root_path
  60. 1 click_on I18n.t('header.account')
  61. 1 click_on(I18n.t('header.log_out'), match: :first)
  62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
  63. end
  64. end
  65. end
  66. end

spec/feature/login_spec.rb

>>>>>>> a5d032d (Fix) 100.0% lines covered

<<<<<<< HEAD 31 relevant lines. 31 lines covered and ======= 19 relevant lines. 19 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Login', type: :feature do
  2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#login' do
  4. 1 before do
  5. 2 visit new_user_session_path
  6. end
  7. 1 context 'when successfully login' do
  8. 1 it 'login' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: user_second.email
  11. 1 fill_in 'user_password', with: user_second.password
  12. 1 click_on I18n.t('header.log_in')
  13. end
  14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  15. end
  16. end
  17. 1 context 'when unsuccessfully login' do
  18. 1 it 'didn`t login' do
  19. 1 within 'form', class: 'new_user', id: 'new_user' do
  20. 1 fill_in 'user_email', with: user_second.email
  21. 1 fill_in 'user_password', with: 'wrong_password'
  22. 1 click_on I18n.t('header.log_in')
  23. end
  24. 1 expect(page).to have_text 'Invalid Email or password.'
  25. end
  26. end
  27. end
  28. end

spec/feature/new_password_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 require_relative '../rails_helper'
  2. 1 require_relative '../support/shared_context'
  3. 1 RSpec.describe 'New Password', type: :feature do
  4. 3 let(:user) { FactoryBot.create(:user) }
  5. 1 describe '#new_password' do
  6. 1 it 'change password' do
  7. 1 user.reset_password('newPassword', 'newPassword')
  8. 1 expect(user.password).to eq('newPassword')
  9. end
  10. 1 it 'not validate password' do
  11. 1 visit new_user_password_path
  12. 1 fill_in 'email', with: user.email
  13. 1 click_on I18n.t('login.send_instructions')
  14. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
  15. end
  16. end
  17. end

spec/feature/registration_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Registration', type: :feature do
  2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#sing_up' do
  4. 1 before do
  5. 3 visit new_user_registration_path
  6. end
  7. 1 context 'when successfully sing_up' do
  8. 1 it 'sing_up users' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
  11. 1 fill_in 'user_password', with: user.password
  12. 1 fill_in 'user_password_confirmation', with: user.password
  13. 1 click_on I18n.t('header.sing_up')
  14. end
  15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  16. end
  17. end
  18. 1 context 'when users is already exits' do
  19. 1 it 'sing_up users' do
  20. 1 within 'form', class: 'new_user', id: 'new_user' do
  21. 1 fill_in 'user_email', with: user.email
  22. 1 fill_in 'user_password', with: user.password
  23. 1 fill_in 'user_password_confirmation', with: user.password
  24. 1 click_on I18n.t('header.sing_up')
  25. end
  26. 1 expect(page).to have_text('Email has already been taken')
  27. end
  28. end
  29. 1 context 'when unsuccessfully sing_up' do
  30. 1 it 'didn`t sing_up' do
  31. 1 within 'form', class: 'new_user', id: 'new_user' do
  32. 1 fill_in 'user_email', with: FFaker::Internet.email
  33. 1 fill_in 'user_password', with: 'password'
  34. 1 fill_in 'user_password_confirmation', with: 'wrong'
  35. 1 click_on I18n.t('header.sing_up')
  36. end
  37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  38. end
  39. end
  40. end
  41. end

spec/feature/review_spec.rb

100.0% lines covered

28 relevant lines. 28 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Review', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 3 let(:user) { create(:user).decorate }
  5. 3 let(:book) { create(:book).decorate }
  6. 1 before do
  7. 2 sign_in(user)
  8. 2 visit book_path(book)
  9. end
  10. 1 shared_examples 'review' do
  11. 2 it 'review' do
  12. 2 find('i', id: rating).click
  13. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
  14. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
  15. 2 click_on I18n.t('review.post')
  16. 2 expect(page).to have_content(result)
  17. end
  18. end
  19. 1 describe '#post review', js: true do
  20. 1 context 'when review posted' do
  21. 2 let(:rating) { "star#{rand(1..5)}" }
  22. 2 let(:title_words) { 3 }
  23. 2 let(:body_words) { 5 }
  24. 2 let(:result) { user.name_or_email }
  25. 1 include_examples 'review'
  26. end
  27. 1 context 'when review not been posted' do
  28. 2 let(:rating) { "star#{rand(1..5)}" }
  29. 2 let(:title_words) { 80 }
  30. 2 let(:body_words) { 30 }
  31. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
  32. 1 include_examples 'review'
  33. end
  34. end
  35. end

spec/feature/settings_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Settings', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 4 let(:user) { create(:user) }
  5. 1 before do
  6. 3 sign_in(user)
  7. 3 visit edit_user_path(user.id)
  8. 3 click_link I18n.t('settings.privacy')
  9. end
  10. 1 describe '#email_change' do
  11. 1 it 'change email' do
  12. 1 within('div', id: 'email') do
  13. 1 fill_in :email, with: FFaker::Internet.email
  14. 1 click_on I18n.t('settings.save')
  15. end
  16. 1 user.confirm
  17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  18. end
  19. end
  20. 1 describe '#password_change' do
  21. 1 context 'when error' do
  22. 1 it 'didnt change password' do
  23. 1 within('div', id: 'password') do
  24. 1 fill_in :current_password, with: user.password
  25. 1 fill_in :password, with: 'newPassword'
  26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
  27. 1 click_on I18n.t('settings.save')
  28. end
  29. 1 user.confirm
  30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
  31. end
  32. end
  33. 1 context 'when successful' do
  34. 1 it 'didnt change password' do
  35. 1 within('div', id: 'password') do
  36. 1 fill_in :current_password, with: user.password
  37. 1 fill_in :password, with: 'newPassword'
  38. 1 fill_in :password_confirmation, with: 'newPassword'
  39. 1 click_on I18n.t('settings.save')
  40. end
  41. 1 user.confirm
  42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
  43. end
  44. end
  45. end
  46. end

spec/feature/shipping_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Shipping', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:user) { FactoryBot.create(:user) }
  5. 1 let(:attributes_for) { attributes_for(:shipping) }
  6. 1 describe '#fill_in', js: true do
  7. 1 it 'fill in shipping' do
  8. 1 sign_in(user)
  9. 1 visit edit_user_path(user.id)
  10. 1 within('div#shipping.col-md-5.mb-40') do
  11. 1 find_all('div', class: 'form-group')[0] do
  12. fill_in :first_name, with: attributes_for[:first_name]
  13. end
  14. 1 find_all('div', class: 'form-group')[1] do
  15. fill_in :last_name, with: attributes_for[:last_name]
  16. end
  17. 1 find_all('div', class: 'form-group')[2] do
  18. fill_in :address, with: attributes_for[:address]
  19. end
  20. 1 find_all('div', class: 'form-group')[3] do
  21. fill_in :city, with: attributes_for[:city]
  22. end
  23. 1 find_all('div', class: 'form-group')[4] do
  24. fill_in :zip, with: attributes_for[:zip]
  25. end
  26. 1 find_all('div', class: 'form-group')[5] do
  27. fill_in :country, with: attributes_for[:country]
  28. end
  29. 1 find_all('div', class: 'form-group')[6] do
  30. fill_in :phone, with: attributes_for[:phone]
  31. end
  32. 1 click_on I18n.t('settings.save')
  33. end
  34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  35. end
  36. end
  37. end

spec/feature/user_spec.rb

100.0% lines covered

42 relevant lines. 42 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'User', type: :feature do
  2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
  3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
  4. 1 describe '#sing_up' do
  5. 1 context 'when successfully sing_up' do
  6. 1 before do
  7. 1 visit new_user_registration_path
  8. 1 within 'form', class: 'new_user', id: 'new_user' do
  9. 1 fill_in 'user_email', with: user.email
  10. 1 fill_in 'user_password', with: user.password
  11. 1 fill_in 'user_password_confirmation', with: user.password
  12. 1 click_on I18n.t('header.sing_up')
  13. end
  14. end
  15. 1 it 'sing_up user' do
  16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  17. end
  18. end
  19. 1 context 'when unsuccessfully sing_up' do
  20. 1 it 'didn`t sing_up' do
  21. 1 visit new_user_registration_path
  22. 1 within 'form', class: 'new_user', id: 'new_user' do
  23. 1 fill_in 'user_email', with: FFaker::Internet.email
  24. 1 fill_in 'user_password', with: 'wrong'
  25. 1 fill_in 'user_password_confirmation', with: 'wrong'
  26. 1 click_on I18n.t('header.sing_up')
  27. end
  28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  29. end
  30. end
  31. end
  32. 1 describe '#login' do
  33. 1 before do
  34. 2 user_second.confirm
  35. end
  36. 1 context 'when successfully login' do
  37. 1 it 'login' do
  38. 1 visit new_user_session_path
  39. 1 within 'form', class: 'new_user', id: 'new_user' do
  40. 1 fill_in 'user_email', with: user_second.email
  41. 1 fill_in 'user_password', with: user_second.password
  42. 1 click_on I18n.t('header.log_in')
  43. end
  44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  45. end
  46. end
  47. 1 context 'when unsuccessfully login' do
  48. 1 it 'didn`t login' do
  49. 1 visit new_user_session_path
  50. 1 within 'form', class: 'new_user', id: 'new_user' do
  51. 1 fill_in 'user_email', with: user_second.email
  52. 1 fill_in 'user_password', with: 'wrong_password'
  53. 1 click_on I18n.t('header.log_in')
  54. end
  55. 1 expect(page).to have_text 'Invalid Email or password.'
  56. end
  57. end
  58. end
  59. end

spec/models/address_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Address, type: :model do
  2. 1 describe 'address' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
  7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
  8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  11. end
  12. 1 context 'when not validations' do
  13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  20. end
  21. 1 context 'when associations' do
  22. 2 it { is_expected.to belong_to(:user) }
  23. end
  24. end
  25. end

spec/models/admin_user_spec.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe AdminUser, type: :model do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:email) }
  5. 2 it { is_expected.to validate_presence_of(:password) }
  6. end
  7. end

spec/models/author_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Author, type: :model do
  2. 1 describe 'author' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:first_name) }
  5. 2 it { is_expected.to validate_presence_of(:last_name) }
  6. end
  7. 1 context 'when associations' do
  8. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  9. 2 it { is_expected.to have_many(:books).through(:authors_books) }
  10. end
  11. end
  12. end

spec/models/authors_book_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe AuthorsBook, type: :model do
  2. 1 describe 'authors_book' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:book) }
  5. 2 it { is_expected.to validate_presence_of(:author) }
  6. end
  7. 1 context 'when associations' do
  8. 2 it { is_expected.to belong_to(:author) }
  9. 2 it { is_expected.to belong_to(:book) }
  10. end
  11. end
  12. end

spec/models/book_spec.rb

100.0% lines covered

16 relevant lines. 16 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Book, type: :model do
  2. 1 describe 'books' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:title) }
  5. 2 it { is_expected.to validate_presence_of(:description) }
  6. 2 it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) }
  7. 2 it { is_expected.to validate_presence_of(:year_of_publication) }
  8. 2 it { is_expected.to validate_presence_of(:quantity) }
  9. 2 it { is_expected.to validate_presence_of(:materials) }
  10. 2 it { is_expected.to validate_presence_of(:dimensions) }
  11. end
  12. 1 context 'when associations' do
  13. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  14. 2 it { is_expected.to have_many(:authors).through(:authors_books) }
  15. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  16. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
  17. 2 it { is_expected.to have_many(:reviews).dependent(:destroy) }
  18. end
  19. end
  20. end

spec/models/books_category_spec.rb

100.0% lines covered

8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe BooksCategory, type: :model do
  2. 1 describe 'books_categories' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:book) }
  5. 2 it { is_expected.to validate_presence_of(:category) }
  6. end
  7. 1 context 'when associations' do
  8. 2 it { is_expected.to belong_to(:category) }
  9. 2 it { is_expected.to belong_to(:book) }
  10. end
  11. end
  12. end

spec/models/category_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Category, type: :model do
  2. 1 describe 'category' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:name) }
  5. end
  6. 1 context 'when associations' do
  7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
  9. end
  10. end
  11. end

spec/models/credit_card_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe CreditCard, type: :model do
  2. 1 context 'when validations' do
  3. 2 it { is_expected.to allow_values('a' * Constants::CARD_NAME_MAX_LENGTH).for(:name) }
  4. 2 it { is_expected.to allow_values('4149499809038407', '4149499115747899').for(:code) }
  5. 2 it { is_expected.to allow_values('342', '123', '423', '093').for(:cvv) }
  6. 2 it { is_expected.to allow_values('12/42', '01/23', '07/22', '08/99').for(:expiration_date) }
  7. end
  8. 1 context 'when not validations' do
  9. 2 it { is_expected.not_to allow_values('a' * Constants::CARD_NAME_MAX_LENGTH.next).for(:name) }
  10. 2 it { is_expected.not_to allow_values('3018--dwq12348979-1853').for(:code) }
  11. 2 it { is_expected.not_to allow_values('1234', 'eqwr').for(:cvv) }
  12. 2 it { is_expected.not_to allow_values('14/32', '00/217').for(:expiration_date) }
  13. end
  14. 1 context 'when associations' do
  15. 2 it { is_expected.to belong_to(:user) }
  16. end
  17. end

spec/models/delivery_spec.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe Delivery, type: :model do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:delivery_method) }
  5. end
  6. 1 context 'when associations' do
  7. 2 it { is_expected.to have_many(:orders).dependent(:nullify) }
  8. end
  9. end

spec/models/order_spec.rb

100.0% lines covered

6 relevant lines. 6 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe Order, type: :model do
  3. 1 describe 'order' do
  4. 1 context 'when associations' do
  5. 2 it { is_expected.to have_many(:order_books).dependent(:destroy) }
  6. 2 it { is_expected.to have_many(:books).through(:order_books) }
  7. end
  8. end
  9. end

spec/models/review_spec.rb

100.0% lines covered

14 relevant lines. 14 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe Review, type: :model do
  3. 1 describe 'review' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:title) }
  6. 2 it { is_expected.to validate_presence_of(:body) }
  7. 2 it { is_expected.to validate_presence_of(:rating) }
  8. 2 it { is_expected.to validate_presence_of(:verified) }
  9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
  10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
  11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
  12. end
  13. 1 context 'when associations' do
  14. 2 it { is_expected.to belong_to(:book) }
  15. 2 it { is_expected.to belong_to(:user) }
  16. end
  17. end
  18. end

spec/models/user_spec.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe User, type: :model do
  2. 1 let(:user) { FactoryBot.create(:user) }
  3. 1 describe 'author' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:email) }
  6. 2 it { is_expected.to validate_presence_of(:password) }
  7. end
  8. 1 context 'with associations' do
  9. 2 it { is_expected.to have_one(:billing) }
  10. 2 it { is_expected.to have_one(:shipping) }
  11. end
  12. end
  13. end

spec/queryes/book_query_spec.rb

100.0% lines covered

45 relevant lines. 45 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe BookQuery do
  3. 1 shared_examples 'sort test' do
  4. 5 it 'sort' do
  5. 5 books
  6. 5 expect(test).to eq(result)
  7. end
  8. end
  9. 3 let(:titles) { %w[Adam Zimbabwe] }
  10. 1 let(:books_dates) do
  11. 1 ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00']
  12. end
  13. 1 describe 'all books sort' do
  14. 1 context 'when sort by title A to Z' do
  15. 1 let(:books) do
  16. 1 create(:book, title: titles.first)
  17. 1 create(:book, title: titles.second)
  18. end
  19. 2 let(:result) { titles.second }
  20. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
  21. 1 include_examples 'sort test'
  22. end
  23. 1 context 'when sort title Z to A' do
  24. 1 let(:books) do
  25. 1 create(:book, title: titles.first)
  26. 1 create(:book, title: titles.second)
  27. end
  28. 2 let(:result) { titles.first }
  29. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
  30. 1 include_examples 'sort test'
  31. end
  32. 1 context 'when sort by price High to Low' do
  33. 1 let(:books) do
  34. 1 create(:book, price_cents: 75)
  35. 1 create(:book, price_cents: 23)
  36. end
  37. 2 let(:result) { 75 }
  38. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
  39. 1 include_examples 'sort test'
  40. end
  41. 1 context 'when sort price Low to High' do
  42. 1 let(:books) do
  43. 1 create(:book, price_cents: 75)
  44. 1 create(:book, price_cents: 23)
  45. end
  46. 2 let(:result) { 23 }
  47. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
  48. 1 include_examples 'sort test'
  49. end
  50. 1 context 'when sort by Newest' do
  51. 1 let(:books) do
  52. 1 create(:book, created_at: books_dates.first)
  53. 1 create(:book, created_at: books_dates.second)
  54. end
  55. 2 let(:result) { books_dates.first }
  56. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
  57. 1 include_examples 'sort test'
  58. end
  59. end
  60. end

spec/support/configs/capybara.rb

100.0% lines covered

19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 19 lines covered and >>>>>>> a5d032d (Fix) 0 lines missed. ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. >>>>>>> 845dac1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 4e7b845 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> b8aab1a (Manifest_cache true) ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> 7c4ea7f (Fix)
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe 'Author' do ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  3. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) =======
  4. >>>>>>> 998f08d (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request authentication helper methods' ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= ======= >>>>>>> 7c4ea7f (Fix) Capybara.configure do |config| >>>>>>> 94841b5 (Featire specs)
  5. 1 config.asset_host = 'http://localhost:3000' <<<<<<< HEAD >>>>>>> 4552227 (Featire specs)
  6. <<<<<<< HEAD <<<<<<< HEAD
  7. =======
  8. >>>>>>> bd8bda4 (Manifest_cache true) =======
  9. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD include_context 'with api request global before and after hooks'
  10. 2 let(:first_name) { FFaker::Name.first_name }
  11. 2 let(:last_name) { FFaker::Name.last_name }
  12. 2 let(:new_name) { FFaker::Name.first_name }
  13. 2 let(:old_name) { author.first_name }
  14. 4 let(:author) { create(:author) }
  15. 1 before do
  16. 4 sign_in(create(:admin_user), :admin_user)
  17. end
  18. 1 it 'can create an author' do
  19. 1 visit 'admin/authors'
  20. 1 click_link('New Author')
  21. 1 fill_in 'author[first_name]', with: first_name
  22. 1 fill_in 'author[last_name]', with: last_name
  23. 2 expect { click_button('Create Author') }.to change(Author, :count).from(0).to(1)
  24. end
  25. 1 it 'can delete an author' do
  26. 1 author
  27. 1 visit 'admin/authors'
  28. 2 expect { click_link('Delete') }.to change(Author, :count).from(1).to(0)
  29. end
  30. 1 it 'can view an author' do
  31. 1 author
  32. 1 visit 'admin/authors'
  33. 1 click_link('View')
  34. 1 expect(page).to have_content(author.first_name)
  35. end
  36. 1 it 'can edit an author' do
  37. 1 author
  38. 1 visit 'admin/authors'
  39. 1 click_link('Edit')
  40. 1 fill_in 'author[first_name]', with: new_name
  41. 4 expect { click_button('Update Author') }.to change { author.reload.first_name }.from(old_name).to(new_name)
  42. end
  43. end

spec/feature/admin/book_spec.rb

100.0% lines covered

32 relevant lines. 32 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe 'Book' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. =======
  5. >>>>>>> d0dc1f1 (Featire specs) =======
  6. >>>>>>> 752f0c0 (Featire specs) =======
  7. >>>>>>> 4e81ea2 (Featire specs) =======
  8. >>>>>>> 08edf50 (Featire specs) =======
  9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  10. >>>>>>> 7a02bbe (Featire specs) =======
  11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:book) { create(:book) } ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) let(:category_one) { FactoryBot.create(:category) }
  12. 3 let(:category_two) { FactoryBot.create(:category) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  13. 1 let(:params) do
  14. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  15. 1 =======
  16. 4 >>>>>>> d0dc1f1 (Featire specs) =======
  17. 4 >>>>>>> 752f0c0 (Featire specs) =======
  18. 4 >>>>>>> 4e81ea2 (Featire specs) =======
  19. 4 >>>>>>> 08edf50 (Featire specs) =======
  20. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  21. 4 >>>>>>> 7a02bbe (Featire specs) =======
  22. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) { title: FFaker::Book.title,
  23. description: FFaker::Book.description,
  24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD price_cents: FFaker::Number.rand(1..100), ======= price: FFaker::Number.rand(1..100), >>>>>>> d0dc1f1 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 752f0c0 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 4e81ea2 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> 08edf50 (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= price: FFaker::Number.rand(1..100), >>>>>>> 7a02bbe (Featire specs) ======= price: FFaker::Number.rand(1..100), >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  25. dimensions: FFaker::Book.cover,
  26. year_of_publication: FFaker::Number.rand(1900..2022),
  27. materials: 'Soft cover',
  28. quantity: FFaker::Number.rand(2..5) }
  29. end
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  31. 1 before do
  32. 4 sign_in(create(:admin_user), :admin_user)
  33. 4 book
  34. 4 visit 'admin/books'
  35. end
  36. 1 it 'can create an category' do
  37. 1 click_link('New Book')
  38. 1 fill_in 'book[title]', with: params[:title]
  39. 1 fill_in 'book[description]', with: params[:description]
  40. 1 fill_in 'book[year_of_publication]', with: params[:year_of_publication]
  41. 1 fill_in 'book[price_cents]', with: params[:price_cents]
  42. 1 fill_in 'book[materials]', with: params[:materials]
  43. 1 fill_in 'book[dimensions]', with: params[:dimensions]
  44. 1 fill_in 'book[quantity]', with: params[:quantity]
  45. 1 click_button('Create Book')
  46. 1 expect(page).to have_content(params[:title])
  47. end
  48. 1 it 'can delete an book' do
  49. 1 click_link('Delete')
  50. 1 expect(page).not_to have_content(book.title)
  51. end
  52. 1 it 'can view an book' do
  53. 1 click_link('View')
  54. 1 expect(page).to have_content(book.title)
  55. end
  56. 1 it 'can edit an book' do
  57. 1 click_link('Edit')
  58. 1 fill_in 'book[title]', with: 'New title'
  59. 1 click_button('Update Book')
  60. 1 expect(page).to have_content('New title')
  61. end
  62. end

spec/feature/admin/category_spec.rb

100.0% lines covered

25 relevant lines. 25 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Category' do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:category_name) { FFaker::Book.genre }
  5. 5 let(:category) { create(:category) }
  6. 1 before do
  7. 4 sign_in(create(:admin_user), :admin_user)
  8. 4 category
  9. 4 visit 'admin/categories'
  10. =======
  11. 7 >>>>>>> d0dc1f1 (Featire specs) =======
  12. 7 >>>>>>> 752f0c0 (Featire specs) =======
  13. 7 >>>>>>> 4e81ea2 (Featire specs) =======
  14. 7 >>>>>>> 08edf50 (Featire specs) =======
  15. 7 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  16. 7 >>>>>>> 7a02bbe (Featire specs) =======
  17. 7 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= let(:book) { FactoryBot.create(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 752f0c0 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 08edf50 (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> 7a02bbe (Featire specs) ======= let(:book) { FactoryBot.create(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  18. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can create an category' do ======= describe '#show book' do >>>>>>> d0dc1f1 (Featire specs) ======= describe '#show book' do >>>>>>> 752f0c0 (Featire specs) ======= describe '#show book' do >>>>>>> 4e81ea2 (Featire specs) ======= describe '#show book' do >>>>>>> 08edf50 (Featire specs) ======= describe '#show book' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= describe '#show book' do >>>>>>> 7a02bbe (Featire specs) ======= describe '#show book' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  19. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('New Category') ======= it 'show books info' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show books info' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show books info' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books info' do >>>>>>> 08edf50 (Featire specs) ======= it 'show books info' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books info' do >>>>>>> 7a02bbe (Featire specs) ======= it 'show books info' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  21. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  22. 1 visit "books/#{book.id}"
  23. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  24. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  25. =======
  26. >>>>>>> d0dc1f1 (Featire specs) =======
  27. >>>>>>> 752f0c0 (Featire specs) =======
  28. >>>>>>> 4e81ea2 (Featire specs) =======
  29. >>>>>>> 08edf50 (Featire specs) =======
  30. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  31. >>>>>>> 7a02bbe (Featire specs) =======
  32. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: category_name ======= expect(page).to have_content(book.title) >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> 08edf50 (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(book.title) >>>>>>> 7a02bbe (Featire specs) ======= expect(page).to have_content(book.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  34. =======
  35. >>>>>>> d0dc1f1 (Featire specs) =======
  36. >>>>>>> 752f0c0 (Featire specs) =======
  37. >>>>>>> 4e81ea2 (Featire specs) =======
  38. >>>>>>> 08edf50 (Featire specs) =======
  39. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  40. >>>>>>> 7a02bbe (Featire specs) =======
  41. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  42. 1 click_button('Create Category') ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  43. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category_name) ======= it 'clicked Beck to results' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> 08edf50 (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked Beck to results' do >>>>>>> 7a02bbe (Featire specs) ======= it 'clicked Beck to results' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  44. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  45. =======
  46. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  47. 1 >>>>>>> 752f0c0 (Featire specs) =======
  48. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  49. 1 >>>>>>> 08edf50 (Featire specs) =======
  50. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  51. 1 >>>>>>> 7a02bbe (Featire specs) =======
  52. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  53. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can delete an category' do ======= find('a', class: 'general-back-link').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> 08edf50 (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'general-back-link').click >>>>>>> 7a02bbe (Featire specs) ======= find('a', class: 'general-back-link').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  55. 1 click_link('Delete')
  56. =======
  57. >>>>>>> d0dc1f1 (Featire specs) =======
  58. >>>>>>> 752f0c0 (Featire specs) =======
  59. >>>>>>> 4e81ea2 (Featire specs) =======
  60. >>>>>>> 08edf50 (Featire specs) =======
  61. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  62. >>>>>>> 7a02bbe (Featire specs) =======
  63. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  65. =======
  66. >>>>>>> d0dc1f1 (Featire specs) =======
  67. >>>>>>> 752f0c0 (Featire specs) =======
  68. >>>>>>> 4e81ea2 (Featire specs) =======
  69. >>>>>>> 08edf50 (Featire specs) =======
  70. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  71. >>>>>>> 7a02bbe (Featire specs) =======
  72. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_content(category.name) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) expect(page).to have_content('Catalog')
  73. end <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  74. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD Capybara.configure do |config| >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  75. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  76. =======
  77. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  78. 1 >>>>>>> 752f0c0 (Featire specs) =======
  79. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  80. 1 >>>>>>> 08edf50 (Featire specs) =======
  81. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  82. 1 >>>>>>> 7a02bbe (Featire specs) =======
  83. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when test read more' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when test read more' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when test read more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when test read more' do >>>>>>> 08edf50 (Featire specs) ======= context 'when test read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when test read more' do >>>>>>> 7a02bbe (Featire specs) ======= context 'when test read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  84. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can view an category' do ======= it 'show read more' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show read more' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show read more' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show read more' do >>>>>>> 08edf50 (Featire specs) ======= it 'show read more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show read more' do >>>>>>> 7a02bbe (Featire specs) ======= it 'show read more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  85. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('View') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  86. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(category.name) ======= expect(page).to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> 08edf50 (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) ======= expect(page).to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  87. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  88. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'can edit an category' do ======= it 'clicked read more', js: true do >>>>>>> d0dc1f1 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> 08edf50 (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'clicked read more', js: true do >>>>>>> 7a02bbe (Featire specs) ======= it 'clicked read more', js: true do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  89. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_link('Edit') ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  90. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD fill_in 'category[name]', with: 'New Genre' ======= click_link 'Read More' >>>>>>> d0dc1f1 (Featire specs) ======= click_link 'Read More' >>>>>>> 752f0c0 (Featire specs) ======= click_link 'Read More' >>>>>>> 4e81ea2 (Featire specs) ======= click_link 'Read More' >>>>>>> 08edf50 (Featire specs) ======= click_link 'Read More' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= click_link 'Read More' >>>>>>> 7a02bbe (Featire specs) ======= click_link 'Read More' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  91. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_button('Update Category') ======= expect(page).not_to have_content('Read More') >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 752f0c0 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> 08edf50 (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).not_to have_content('Read More') >>>>>>> 7a02bbe (Featire specs) ======= expect(page).not_to have_content('Read More') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  92. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  93. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  94. 1 =======
  95. >>>>>>> d0dc1f1 (Featire specs) =======
  96. >>>>>>> 752f0c0 (Featire specs) =======
  97. >>>>>>> 4e81ea2 (Featire specs) =======
  98. >>>>>>> 08edf50 (Featire specs) =======
  99. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  100. >>>>>>> 7a02bbe (Featire specs) =======
  101. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content('New Genre') ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  102. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
  103. end

spec/feature/billing_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Billing', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  5. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  6. 2 let(:user) { create(:user) }
  7. 1 let(:attributes_for) { attributes_for(:billing) }
  8. 1 describe '#fill_in', js: true do
  9. 1 it 'fill in billing' do
  10. 1 sign_in(user)
  11. 1 visit edit_user_path(user.id)
  12. 1 within('div#billing.col-md-5.mb-40') do
  13. 1 find_all('div', class: 'form-group')[0] do
  14. fill_in :first_name, with: attributes_for[:first_name]
  15. end
  16. 1 find_all('div', class: 'form-group')[1] do
  17. fill_in :last_name, with: attributes_for[:last_name]
  18. end
  19. 1 find_all('div', class: 'form-group')[2] do
  20. fill_in :address, with: attributes_for[:address]
  21. end
  22. 1 find_all('div', class: 'form-group')[3] do
  23. fill_in :city, with: attributes_for[:city]
  24. end
  25. 1 find_all('div', class: 'form-group')[4] do
  26. fill_in :zip, with: attributes_for[:zip]
  27. end
  28. 1 find_all('div', class: 'form-group')[5] do
  29. fill_in :country, with: attributes_for[:country]
  30. end
  31. 1 find_all('div', class: 'form-group')[6] do
  32. fill_in :phone, with: attributes_for[:phone]
  33. end
  34. 1 click_on I18n.t('settings.save')
  35. end
  36. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  37. end
  38. end
  39. end

spec/feature/book_spec.rb

100.0% lines covered

104 relevant lines. 104 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Book', type: :feature do
  2. 5 let(:category_one) { create(:category) }
  3. 3 let(:category_two) { create(:category) }
  4. 1 let(:params) do
  5. 4 { title: FFaker::Book.title,
  6. description: FFaker::Book.description,
  7. price_cents: FFaker::Number.rand(1..100),
  8. dimensions: FFaker::Book.cover,
  9. year_of_publication: FFaker::Number.rand(1900..2022),
  10. materials: 'Soft cover',
  11. quantity: FFaker::Number.rand(2..5) }
  12. end
  13. 7 let(:book) { create(:book).decorate }
  14. 1 describe '#show book' do
  15. 1 it 'show books info' do
  16. 1 visit "books/#{book.id}"
  17. 1 expect(page).to have_content(book.title)
  18. end
  19. 1 it 'clicked Beck to results' do
  20. 1 visit "books/#{book.id}"
  21. 1 find('a', class: 'general-back-link').click
  22. 1 expect(page).to have_content(I18n.t('catalog_page.title'))
  23. end
  24. 1 context 'when test read more' do
  25. 1 it 'show read more' do
  26. 1 visit "books/#{book.id}"
  27. 1 expect(page).to have_content(I18n.t('book_page.read_more'))
  28. end
  29. 1 it 'clicked read more', js: true do
  30. 1 visit "books/#{book.id}"
  31. 1 click_link 'Read More'
  32. 1 expect(page).not_to have_content(I18n.t('book_page.read_more'))
  33. end
  34. end
  35. =======
  36. >>>>>>> d0dc1f1 (Featire specs) =======
  37. >>>>>>> 752f0c0 (Featire specs) =======
  38. >>>>>>> 4e81ea2 (Featire specs) =======
  39. >>>>>>> 08edf50 (Featire specs) =======
  40. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  41. >>>>>>> 7a02bbe (Featire specs) =======
  42. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 context 'when quantity changes', js: true do
  43. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  44. =======
  45. >>>>>>> d0dc1f1 (Featire specs) =======
  46. >>>>>>> 752f0c0 (Featire specs) =======
  47. >>>>>>> 4e81ea2 (Featire specs) =======
  48. >>>>>>> 08edf50 (Featire specs) =======
  49. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  50. >>>>>>> 7a02bbe (Featire specs) =======
  51. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 before do
  52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  53. 2 visit "books/#{book.id}"
  54. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  55. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'inc').click ======= visit "books/#{book.id}" >>>>>>> d0dc1f1 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 752f0c0 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 4e81ea2 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> 08edf50 (Featire specs) ======= visit "books/#{book.id}" >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit "books/#{book.id}" >>>>>>> 7a02bbe (Featire specs) ======= visit "books/#{book.id}" >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end
  57. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  59. 1 =======
  60. 2 >>>>>>> d0dc1f1 (Featire specs) =======
  61. 2 >>>>>>> 752f0c0 (Featire specs) =======
  62. 2 >>>>>>> 4e81ea2 (Featire specs) =======
  63. 2 >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  64. 2 find('a', class: 'inc').click
  65. end
  66. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'increase quantity' do ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'increase quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) it 'increase quantity' do ======= find('a', class: 'inc').click >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= find('a', class: 'inc').click >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= it 'increase quantity', js: true do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= it 'increase quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  67. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  68. =======
  69. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  70. >>>>>>> 7a02bbe (Featire specs) =======
  71. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content("€#{Money.new(book.price_cents * 2)}")
  72. =======
  73. >>>>>>> d0dc1f1 (Featire specs) =======
  74. >>>>>>> 752f0c0 (Featire specs) =======
  75. >>>>>>> 4e81ea2 (Featire specs) =======
  76. >>>>>>> 08edf50 (Featire specs) end
  77. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  78. =======
  79. >>>>>>> d0dc1f1 (Featire specs) =======
  80. >>>>>>> 752f0c0 (Featire specs) =======
  81. >>>>>>> 4e81ea2 (Featire specs) =======
  82. >>>>>>> 08edf50 (Featire specs)
  83. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  84. =======
  85. >>>>>>> d0dc1f1 (Featire specs) =======
  86. >>>>>>> 752f0c0 (Featire specs) =======
  87. >>>>>>> 4e81ea2 (Featire specs) =======
  88. >>>>>>> 08edf50 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'decrease quantity' do ======= it 'decrease quantity', js: true do >>>>>>> 752f0c0 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) ======= it 'decrease quantity', js: true do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= it 'decrease quantity' do >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) it 'decrease quantity' do ======= it 'increase quantity', js: true do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= ======= it 'increase quantity', js: true do >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs)
  89. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  90. =======
  91. >>>>>>> d0dc1f1 (Featire specs) =======
  92. >>>>>>> 752f0c0 (Featire specs) =======
  93. >>>>>>> 4e81ea2 (Featire specs) =======
  94. >>>>>>> 08edf50 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'dec').click ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price * 2}")
  95. end
  96. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  97. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) it 'decrease quantity', js: true do ======= it 'decrease quantity' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'decrease quantity', js: true do >>>>>>> 7a02bbe (Featire specs) ======= it 'decrease quantity' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  98. 1 find('a', class: 'dec').click
  99. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) expect(page).to have_content("€#{book.price}")
  100. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  101. end
  102. end
  103. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  104. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  105. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  106. end
  107. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  108. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  109. 1 describe '#catalog' do
  110. 1 describe 'filter by category' do
  111. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  112. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) describe '#catalog' do
  113. 1 describe 'filter by category' do
  114. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) before do
  115. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  116. =======
  117. >>>>>>> d0dc1f1 (Featire specs) =======
  118. >>>>>>> 752f0c0 (Featire specs) =======
  119. >>>>>>> 4e81ea2 (Featire specs) =======
  120. >>>>>>> 08edf50 (Featire specs) =======
  121. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  122. >>>>>>> 7a02bbe (Featire specs) =======
  123. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 category_one.books.create(params)
  124. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  125. =======
  126. >>>>>>> d0dc1f1 (Featire specs) =======
  127. >>>>>>> 752f0c0 (Featire specs) =======
  128. >>>>>>> 4e81ea2 (Featire specs) =======
  129. >>>>>>> 08edf50 (Featire specs) =======
  130. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  131. >>>>>>> 7a02bbe (Featire specs) =======
  132. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 visit books_path
  133. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  134. =======
  135. >>>>>>> d0dc1f1 (Featire specs) =======
  136. >>>>>>> 752f0c0 (Featire specs) =======
  137. >>>>>>> 4e81ea2 (Featire specs) =======
  138. >>>>>>> 08edf50 (Featire specs) =======
  139. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  140. >>>>>>> 7a02bbe (Featire specs) =======
  141. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  142. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  143. =======
  144. >>>>>>> d0dc1f1 (Featire specs) =======
  145. >>>>>>> 752f0c0 (Featire specs) =======
  146. >>>>>>> 4e81ea2 (Featire specs) =======
  147. >>>>>>> 08edf50 (Featire specs) =======
  148. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  149. >>>>>>> 7a02bbe (Featire specs) =======
  150. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  151. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  152. =======
  153. >>>>>>> d0dc1f1 (Featire specs) =======
  154. >>>>>>> 752f0c0 (Featire specs) =======
  155. >>>>>>> 4e81ea2 (Featire specs) =======
  156. >>>>>>> 08edf50 (Featire specs) =======
  157. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  158. >>>>>>> 7a02bbe (Featire specs) =======
  159. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 after do
  160. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  161. =======
  162. >>>>>>> d0dc1f1 (Featire specs) =======
  163. >>>>>>> 752f0c0 (Featire specs) =======
  164. >>>>>>> 4e81ea2 (Featire specs) =======
  165. >>>>>>> 08edf50 (Featire specs) =======
  166. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  167. >>>>>>> 7a02bbe (Featire specs) =======
  168. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 category_one.destroy
  169. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  170. =======
  171. >>>>>>> d0dc1f1 (Featire specs) =======
  172. >>>>>>> 752f0c0 (Featire specs) =======
  173. >>>>>>> 4e81ea2 (Featire specs) =======
  174. >>>>>>> 08edf50 (Featire specs) =======
  175. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  176. >>>>>>> 7a02bbe (Featire specs) =======
  177. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  178. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  179. =======
  180. >>>>>>> d0dc1f1 (Featire specs) =======
  181. >>>>>>> 752f0c0 (Featire specs) =======
  182. >>>>>>> 4e81ea2 (Featire specs) =======
  183. >>>>>>> 08edf50 (Featire specs) =======
  184. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  185. >>>>>>> 7a02bbe (Featire specs) =======
  186. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  187. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  188. =======
  189. >>>>>>> d0dc1f1 (Featire specs) =======
  190. >>>>>>> 752f0c0 (Featire specs) =======
  191. >>>>>>> 4e81ea2 (Featire specs) =======
  192. >>>>>>> 08edf50 (Featire specs) =======
  193. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  194. >>>>>>> 7a02bbe (Featire specs) =======
  195. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 it 'show book count for category' do
  196. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  197. =======
  198. >>>>>>> d0dc1f1 (Featire specs) =======
  199. >>>>>>> 752f0c0 (Featire specs) =======
  200. >>>>>>> 4e81ea2 (Featire specs) =======
  201. >>>>>>> 08edf50 (Featire specs) =======
  202. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  203. >>>>>>> 7a02bbe (Featire specs) =======
  204. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_one.books.size)
  205. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  206. =======
  207. >>>>>>> d0dc1f1 (Featire specs) =======
  208. >>>>>>> 752f0c0 (Featire specs) =======
  209. >>>>>>> 4e81ea2 (Featire specs) =======
  210. >>>>>>> 08edf50 (Featire specs) =======
  211. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  212. >>>>>>> 7a02bbe (Featire specs) =======
  213. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  214. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  215. =======
  216. >>>>>>> d0dc1f1 (Featire specs) =======
  217. >>>>>>> 752f0c0 (Featire specs) =======
  218. >>>>>>> 4e81ea2 (Featire specs) =======
  219. >>>>>>> 08edf50 (Featire specs) =======
  220. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  221. >>>>>>> 7a02bbe (Featire specs) =======
  222. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  223. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  224. 1 it 'filter book by category' do
  225. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
  226. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  227. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) it 'filter book by category' do
  228. 1 within 'ul', class: 'list-inline pt-10 mb-25 mr-240', id: 'filter' do
  229. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) click_on category_one.name
  230. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  231. =======
  232. >>>>>>> d0dc1f1 (Featire specs) =======
  233. >>>>>>> 752f0c0 (Featire specs) =======
  234. >>>>>>> 4e81ea2 (Featire specs) =======
  235. >>>>>>> 08edf50 (Featire specs) =======
  236. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  237. >>>>>>> 7a02bbe (Featire specs) =======
  238. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  239. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  240. =======
  241. >>>>>>> d0dc1f1 (Featire specs) =======
  242. >>>>>>> 752f0c0 (Featire specs) =======
  243. >>>>>>> 4e81ea2 (Featire specs) =======
  244. >>>>>>> 08edf50 (Featire specs) =======
  245. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  246. >>>>>>> 7a02bbe (Featire specs) =======
  247. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  248. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  249. =======
  250. >>>>>>> d0dc1f1 (Featire specs) =======
  251. >>>>>>> 752f0c0 (Featire specs) =======
  252. >>>>>>> 4e81ea2 (Featire specs) =======
  253. >>>>>>> 08edf50 (Featire specs) =======
  254. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  255. >>>>>>> 7a02bbe (Featire specs) =======
  256. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_one.books.first.title)
  257. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  258. =======
  259. >>>>>>> d0dc1f1 (Featire specs) =======
  260. >>>>>>> 752f0c0 (Featire specs) =======
  261. >>>>>>> 4e81ea2 (Featire specs) =======
  262. >>>>>>> 08edf50 (Featire specs) =======
  263. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  264. >>>>>>> 7a02bbe (Featire specs) =======
  265. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  266. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  267. =======
  268. >>>>>>> d0dc1f1 (Featire specs) =======
  269. >>>>>>> 752f0c0 (Featire specs) =======
  270. >>>>>>> 4e81ea2 (Featire specs) =======
  271. >>>>>>> 08edf50 (Featire specs) =======
  272. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  273. >>>>>>> 7a02bbe (Featire specs) =======
  274. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  275. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  276. =======
  277. >>>>>>> d0dc1f1 (Featire specs) =======
  278. >>>>>>> 752f0c0 (Featire specs) =======
  279. >>>>>>> 4e81ea2 (Featire specs) =======
  280. >>>>>>> 08edf50 (Featire specs) =======
  281. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  282. >>>>>>> 7a02bbe (Featire specs) =======
  283. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  284. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  285. =======
  286. >>>>>>> d0dc1f1 (Featire specs) =======
  287. >>>>>>> 752f0c0 (Featire specs) =======
  288. >>>>>>> 4e81ea2 (Featire specs) =======
  289. >>>>>>> 08edf50 (Featire specs) =======
  290. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  291. >>>>>>> 7a02bbe (Featire specs) =======
  292. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 describe 'filter by all books' do
  293. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  294. =======
  295. >>>>>>> d0dc1f1 (Featire specs) =======
  296. >>>>>>> 752f0c0 (Featire specs) =======
  297. >>>>>>> 4e81ea2 (Featire specs) =======
  298. >>>>>>> 08edf50 (Featire specs) =======
  299. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  300. >>>>>>> 7a02bbe (Featire specs) =======
  301. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 before do
  302. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  303. =======
  304. >>>>>>> d0dc1f1 (Featire specs) =======
  305. >>>>>>> 752f0c0 (Featire specs) =======
  306. >>>>>>> 4e81ea2 (Featire specs) =======
  307. >>>>>>> 08edf50 (Featire specs) =======
  308. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  309. >>>>>>> 7a02bbe (Featire specs) =======
  310. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 category_one.books.create(params)
  311. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  312. 2 category_two.books.create(params)
  313. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  314. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit books_path ======= category_two.books.create(params) >>>>>>> d0dc1f1 (Featire specs) ======= category_two.books.create(params) >>>>>>> 752f0c0 (Featire specs) ======= category_two.books.create(params) >>>>>>> 4e81ea2 (Featire specs) ======= category_two.books.create(params) >>>>>>> 08edf50 (Featire specs) ======= category_two.books.create(params) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= category_two.books.create(params) >>>>>>> 7a02bbe (Featire specs) ======= category_two.books.create(params) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  315. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD click_on I18n.t('catalog_page.all') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  316. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  317. 2 click_on 'All'
  318. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  319. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  320. =======
  321. >>>>>>> d0dc1f1 (Featire specs) =======
  322. >>>>>>> 752f0c0 (Featire specs) =======
  323. >>>>>>> 4e81ea2 (Featire specs) =======
  324. >>>>>>> 08edf50 (Featire specs) =======
  325. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  326. >>>>>>> 7a02bbe (Featire specs) =======
  327. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  328. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  329. =======
  330. >>>>>>> d0dc1f1 (Featire specs) =======
  331. >>>>>>> 752f0c0 (Featire specs) =======
  332. >>>>>>> 4e81ea2 (Featire specs) =======
  333. >>>>>>> 08edf50 (Featire specs) =======
  334. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  335. >>>>>>> 7a02bbe (Featire specs) =======
  336. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 after do
  337. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  338. =======
  339. >>>>>>> d0dc1f1 (Featire specs) =======
  340. >>>>>>> 752f0c0 (Featire specs) =======
  341. >>>>>>> 4e81ea2 (Featire specs) =======
  342. >>>>>>> 08edf50 (Featire specs) =======
  343. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  344. >>>>>>> 7a02bbe (Featire specs) =======
  345. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 category_one.destroy
  346. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  347. =======
  348. >>>>>>> d0dc1f1 (Featire specs) =======
  349. >>>>>>> 752f0c0 (Featire specs) =======
  350. >>>>>>> 4e81ea2 (Featire specs) =======
  351. >>>>>>> 08edf50 (Featire specs) =======
  352. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  353. >>>>>>> 7a02bbe (Featire specs) =======
  354. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 category_two.destroy
  355. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  356. =======
  357. >>>>>>> d0dc1f1 (Featire specs) =======
  358. >>>>>>> 752f0c0 (Featire specs) =======
  359. >>>>>>> 4e81ea2 (Featire specs) =======
  360. >>>>>>> 08edf50 (Featire specs) =======
  361. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  362. >>>>>>> 7a02bbe (Featire specs) =======
  363. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  364. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  365. =======
  366. >>>>>>> d0dc1f1 (Featire specs) =======
  367. >>>>>>> 752f0c0 (Featire specs) =======
  368. >>>>>>> 4e81ea2 (Featire specs) =======
  369. >>>>>>> 08edf50 (Featire specs) =======
  370. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  371. >>>>>>> 7a02bbe (Featire specs) =======
  372. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  373. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  374. =======
  375. >>>>>>> d0dc1f1 (Featire specs) =======
  376. >>>>>>> 752f0c0 (Featire specs) =======
  377. >>>>>>> 4e81ea2 (Featire specs) =======
  378. >>>>>>> 08edf50 (Featire specs) =======
  379. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  380. >>>>>>> 7a02bbe (Featire specs) =======
  381. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 it 'shown books for first category' do
  382. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  383. =======
  384. >>>>>>> d0dc1f1 (Featire specs) =======
  385. >>>>>>> 752f0c0 (Featire specs) =======
  386. >>>>>>> 4e81ea2 (Featire specs) =======
  387. >>>>>>> 08edf50 (Featire specs) =======
  388. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  389. >>>>>>> 7a02bbe (Featire specs) =======
  390. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_one.books.first.title)
  391. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  392. =======
  393. >>>>>>> d0dc1f1 (Featire specs) =======
  394. >>>>>>> 752f0c0 (Featire specs) =======
  395. >>>>>>> 4e81ea2 (Featire specs) =======
  396. >>>>>>> 08edf50 (Featire specs) =======
  397. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  398. >>>>>>> 7a02bbe (Featire specs) =======
  399. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  400. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  401. =======
  402. >>>>>>> d0dc1f1 (Featire specs) =======
  403. >>>>>>> 752f0c0 (Featire specs) =======
  404. >>>>>>> 4e81ea2 (Featire specs) =======
  405. >>>>>>> 08edf50 (Featire specs) =======
  406. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  407. >>>>>>> 7a02bbe (Featire specs) =======
  408. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  409. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  410. =======
  411. >>>>>>> d0dc1f1 (Featire specs) =======
  412. >>>>>>> 752f0c0 (Featire specs) =======
  413. >>>>>>> 4e81ea2 (Featire specs) =======
  414. >>>>>>> 08edf50 (Featire specs) =======
  415. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  416. >>>>>>> 7a02bbe (Featire specs) =======
  417. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 it 'shown books for second category' do
  418. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  419. =======
  420. >>>>>>> d0dc1f1 (Featire specs) =======
  421. >>>>>>> 752f0c0 (Featire specs) =======
  422. >>>>>>> 4e81ea2 (Featire specs) =======
  423. >>>>>>> 08edf50 (Featire specs) =======
  424. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  425. >>>>>>> 7a02bbe (Featire specs) =======
  426. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 expect(page).to have_content(category_two.books.first.title)
  427. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  428. end
  429. end
  430. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  431. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  432. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  433. end
  434. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  435. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  436. =======
  437. >>>>>>> d0dc1f1 (Featire specs) =======
  438. >>>>>>> 752f0c0 (Featire specs) =======
  439. >>>>>>> 4e81ea2 (Featire specs) =======
  440. >>>>>>> 08edf50 (Featire specs) =======
  441. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  442. >>>>>>> 7a02bbe (Featire specs) =======
  443. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 describe 'load_more' do
  444. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  445. =======
  446. >>>>>>> d0dc1f1 (Featire specs) =======
  447. >>>>>>> 752f0c0 (Featire specs) =======
  448. >>>>>>> 4e81ea2 (Featire specs) =======
  449. >>>>>>> 08edf50 (Featire specs) =======
  450. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  451. >>>>>>> 7a02bbe (Featire specs) =======
  452. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 before do
  453. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  454. =======
  455. >>>>>>> d0dc1f1 (Featire specs) =======
  456. >>>>>>> 752f0c0 (Featire specs) =======
  457. >>>>>>> 4e81ea2 (Featire specs) =======
  458. >>>>>>> 08edf50 (Featire specs) =======
  459. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  460. >>>>>>> 7a02bbe (Featire specs) =======
  461. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 3 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 24.times do ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= 24.times do >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 9c0d812 (Featire specs) ======= 24.times do >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= 24.times do >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD (BooksController::PAGINATION_PER_PAGE * 2).times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= 24.times do >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) 24.times do ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= (ApplicationHelper::PAGINATION_PER_PAGE * 2).times do >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= (BooksController::PAGINATION_PER_PAGE * 2).times do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> c346782 (Fix book_spec decrease quantity and price)
  462. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  463. =======
  464. >>>>>>> d0dc1f1 (Featire specs) =======
  465. >>>>>>> 752f0c0 (Featire specs) =======
  466. >>>>>>> 4e81ea2 (Featire specs) =======
  467. >>>>>>> 08edf50 (Featire specs) =======
  468. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  469. >>>>>>> 7a02bbe (Featire specs) =======
  470. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 72 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD books << create(:book)
  471. end
  472. end ======= books << FactoryBot.create(:book) >>>>>>> d0dc1f1 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 752f0c0 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 4e81ea2 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> 08edf50 (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= books << FactoryBot.create(:book) >>>>>>> 7a02bbe (Featire specs) ======= books << FactoryBot.create(:book) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  473. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  474. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  475. 4 =======
  476. >>>>>>> d0dc1f1 (Featire specs) =======
  477. >>>>>>> 752f0c0 (Featire specs) =======
  478. >>>>>>> 4e81ea2 (Featire specs) =======
  479. >>>>>>> 08edf50 (Featire specs) =======
  480. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  481. >>>>>>> 7a02bbe (Featire specs) =======
  482. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:books) { [] } ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  483. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  484. 1 =======
  485. 4 >>>>>>> d0dc1f1 (Featire specs) =======
  486. 4 >>>>>>> 752f0c0 (Featire specs) =======
  487. 4 >>>>>>> 4e81ea2 (Featire specs) =======
  488. 4 >>>>>>> 08edf50 (Featire specs) =======
  489. 4 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  490. 4 >>>>>>> 7a02bbe (Featire specs) =======
  491. 4 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it 'show books without view more button' do ======= let(:books) { [] } >>>>>>> d0dc1f1 (Featire specs) ======= let(:books) { [] } >>>>>>> 752f0c0 (Featire specs) ======= let(:books) { [] } >>>>>>> 4e81ea2 (Featire specs) ======= let(:books) { [] } >>>>>>> 08edf50 (Featire specs) ======= let(:books) { [] } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:books) { [] } >>>>>>> 7a02bbe (Featire specs) ======= let(:books) { [] } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  492. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  493. 1 visit books_path
  494. =======
  495. >>>>>>> d0dc1f1 (Featire specs) =======
  496. >>>>>>> 752f0c0 (Featire specs) =======
  497. >>>>>>> 4e81ea2 (Featire specs) =======
  498. >>>>>>> 08edf50 (Featire specs) =======
  499. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  500. >>>>>>> 7a02bbe (Featire specs) =======
  501. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  502. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  503. 1 it 'show books without view more button' do
  504. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  505. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', id: 'view_more', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  506. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more') ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  507. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  508. 1 expect(page).not_to have_css('a', class: 'view_more hidden', id: 'view_more')
  509. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  510. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  511. =======
  512. >>>>>>> d0dc1f1 (Featire specs) =======
  513. >>>>>>> 752f0c0 (Featire specs) =======
  514. >>>>>>> 4e81ea2 (Featire specs) =======
  515. >>>>>>> 08edf50 (Featire specs) =======
  516. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  517. >>>>>>> 7a02bbe (Featire specs) =======
  518. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  519. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  520. 1 context 'when view more' do
  521. 1 it 'show books with view more button' do
  522. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  523. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD visit books_path ======= context 'when view more' do >>>>>>> d0dc1f1 (Featire specs) ======= context 'when view more' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when view more' do >>>>>>> 4e81ea2 (Featire specs) ======= context 'when view more' do >>>>>>> 08edf50 (Featire specs) ======= context 'when view more' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= context 'when view more' do >>>>>>> 7a02bbe (Featire specs) ======= context 'when view more' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  524. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  525. =======
  526. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  527. 1 >>>>>>> 752f0c0 (Featire specs) =======
  528. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  529. 1 >>>>>>> 08edf50 (Featire specs) =======
  530. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  531. 1 >>>>>>> 7a02bbe (Featire specs) =======
  532. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it 'show books with view more button' do >>>>>>> d0dc1f1 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 752f0c0 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 4e81ea2 (Featire specs) ======= it 'show books with view more button' do >>>>>>> 08edf50 (Featire specs) ======= it 'show books with view more button' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it 'show books with view more button' do >>>>>>> 7a02bbe (Featire specs) ======= it 'show books with view more button' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  533. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_css('a', class: 'view_more') ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  534. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  535. 1 expect(page).to have_css('a', class: 'view_more')
  536. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  537. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  538. =======
  539. >>>>>>> d0dc1f1 (Featire specs) =======
  540. >>>>>>> 752f0c0 (Featire specs) =======
  541. >>>>>>> 4e81ea2 (Featire specs) =======
  542. >>>>>>> 08edf50 (Featire specs) =======
  543. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  544. >>>>>>> 7a02bbe (Featire specs) =======
  545. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  546. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  547. =======
  548. >>>>>>> d0dc1f1 (Featire specs) =======
  549. >>>>>>> 752f0c0 (Featire specs) =======
  550. >>>>>>> 4e81ea2 (Featire specs) =======
  551. >>>>>>> 08edf50 (Featire specs) =======
  552. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  553. >>>>>>> 7a02bbe (Featire specs) =======
  554. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 it 'show loaded books', js: true do
  555. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  556. 1 visit books_path
  557. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  558. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'view_more').click ======= visit books_path >>>>>>> d0dc1f1 (Featire specs) ======= visit books_path >>>>>>> 752f0c0 (Featire specs) ======= visit books_path >>>>>>> 4e81ea2 (Featire specs) ======= visit books_path >>>>>>> 08edf50 (Featire specs) ======= visit books_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= visit books_path >>>>>>> 7a02bbe (Featire specs) ======= visit books_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  559. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD expect(page).to have_content(books.last.title) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 08edf50 (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> 7a02bbe (Featire specs) ======= find('a', id: 'view_more', class: 'view_more').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  560. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  561. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  562. =======
  563. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  564. 1 >>>>>>> 752f0c0 (Featire specs) =======
  565. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  566. 1 >>>>>>> 08edf50 (Featire specs) =======
  567. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  568. 1 >>>>>>> 7a02bbe (Featire specs) =======
  569. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= expect(page).to have_content(books.last.title) >>>>>>> d0dc1f1 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 752f0c0 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 4e81ea2 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> 08edf50 (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= expect(page).to have_content(books.last.title) >>>>>>> 7a02bbe (Featire specs) ======= expect(page).to have_content(books.last.title) >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  570. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 752f0c0 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs) ======= end >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= end >>>>>>> 7a02bbe (Featire specs) ======= end >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  571. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  572. end
  573. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  574. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  575. =======
  576. >>>>>>> d0dc1f1 (Featire specs) =======
  577. >>>>>>> 752f0c0 (Featire specs) =======
  578. >>>>>>> 4e81ea2 (Featire specs) =======
  579. >>>>>>> 08edf50 (Featire specs) =======
  580. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  581. >>>>>>> 7a02bbe (Featire specs) =======
  582. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 describe 'sort' do
  583. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  584. =======
  585. >>>>>>> d0dc1f1 (Featire specs) =======
  586. >>>>>>> 752f0c0 (Featire specs) =======
  587. >>>>>>> 4e81ea2 (Featire specs) =======
  588. >>>>>>> 08edf50 (Featire specs) =======
  589. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  590. >>>>>>> 7a02bbe (Featire specs) =======
  591. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 shared_examples 'sort test' do
  592. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  593. =======
  594. >>>>>>> d0dc1f1 (Featire specs) =======
  595. >>>>>>> 752f0c0 (Featire specs) =======
  596. >>>>>>> 4e81ea2 (Featire specs) =======
  597. >>>>>>> 08edf50 (Featire specs) =======
  598. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  599. >>>>>>> 7a02bbe (Featire specs) =======
  600. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 5 it 'sort books' do
  601. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  602. 5 create(:book, title: 'Zimbabwe', price_cents: 75,
  603. created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00')
  604. ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  605. 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD create(:book, title: 'Anna', price_cents: 23, ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> d0dc1f1 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 752f0c0 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 4e81ea2 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 08edf50 (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> 7a02bbe (Featire specs) ======= FactoryBot.create(:book, title: 'Zimbabwe', price: 75, >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  606. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= ======= >>>>>>> d780a52 (Rebased) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 12bcf81 (Featire specs) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 9c0d812 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00') ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= created_at: 'Thu, 25 Aug 2022 15:20:38.761014000 UTC +00:00') >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> c346782 (Fix book_spec decrease quantity and price)
  607. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  608. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  609. 5 FactoryBot.create(:book, title: 'Anna', price: 23, created_at: 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00')
  610. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  611. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  612. =======
  613. >>>>>>> d0dc1f1 (Featire specs) =======
  614. >>>>>>> 752f0c0 (Featire specs) =======
  615. >>>>>>> 4e81ea2 (Featire specs) =======
  616. >>>>>>> 08edf50 (Featire specs) =======
  617. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  618. >>>>>>> 7a02bbe (Featire specs) =======
  619. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 5 visit books_path
  620. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  621. =======
  622. >>>>>>> d0dc1f1 (Featire specs) =======
  623. >>>>>>> 752f0c0 (Featire specs) =======
  624. >>>>>>> 4e81ea2 (Featire specs) =======
  625. >>>>>>> 08edf50 (Featire specs) =======
  626. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  627. >>>>>>> 7a02bbe (Featire specs) =======
  628. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  629. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  630. =======
  631. >>>>>>> d0dc1f1 (Featire specs) =======
  632. >>>>>>> 752f0c0 (Featire specs) =======
  633. >>>>>>> 4e81ea2 (Featire specs) =======
  634. >>>>>>> 08edf50 (Featire specs) =======
  635. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  636. >>>>>>> 7a02bbe (Featire specs) =======
  637. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 5 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD find('a', class: 'dropdown-toggle lead small', text: I18n.t('catalog_page.sorting.newer_first'),
  638. id: 'menu').click ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> d0dc1f1 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 752f0c0 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 4e81ea2 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 08edf50 (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> 7a02bbe (Featire specs) ======= find('a', class: 'dropdown-toggle lead small', text: 'Newest first', id: 'menu').click >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  639. 5 within 'ul', class: 'dropdown-menu', id: 'sort' do
  640. 5 click_link button
  641. end
  642. 5 expect(find('.col-xs-6.col-sm-3', match: :first)).to have_content(book_title)
  643. end
  644. end
  645. 1 context 'when sort by title A to Z' do
  646. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.asc') } ======= let(:button) { 'Title: A to Z' } >>>>>>> d0dc1f1 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: A to Z' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Title: A to Z' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  647. 2 let(:book_title) { 'Anna' }
  648. 1 include_examples 'sort test'
  649. end
  650. 1 context 'when sort by title Z to A' do
  651. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.title.desc') } ======= let(:button) { 'Title: Z to A' } >>>>>>> d0dc1f1 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Title: Z to A' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Title: Z to A' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  652. 2 let(:book_title) { 'Zimbabwe' }
  653. 1 include_examples 'sort test'
  654. end
  655. 1 context 'when sort by price High to Low' do
  656. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.desc') } ======= let(:button) { 'Price: High to Low' } >>>>>>> d0dc1f1 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: High to Low' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Price: High to Low' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  657. 2 let(:book_title) { 'Zimbabwe' }
  658. 1 include_examples 'sort test'
  659. end
  660. 1 context 'when sort by price Low to High' do
  661. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.price.asc') } ======= let(:button) { 'Price: Low to High' } >>>>>>> d0dc1f1 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Price: Low to High' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Price: Low to High' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  662. 2 let(:book_title) { 'Anna' }
  663. 1 include_examples 'sort test'
  664. end
  665. 1 context 'when sort by newest' do
  666. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD let(:button) { I18n.t('catalog_page.sorting.newer_first') } ======= let(:button) { 'Newest first' } >>>>>>> d0dc1f1 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 752f0c0 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 4e81ea2 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> 08edf50 (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= let(:button) { 'Newest first' } >>>>>>> 7a02bbe (Featire specs) ======= let(:button) { 'Newest first' } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  667. 2 let(:book_title) { 'Zimbabwe' }
  668. 1 include_examples 'sort test'
  669. end
  670. end
  671. end

spec/feature/home_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 49 relevant lines. 49 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Home', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 1 describe 'Get Started' do
  5. 1 it 'on click move to catalog page' do
  6. 1 visit root_path
  7. 1 click_on 'Get Started'
  8. 1 expect(page).to have_content('Catalog')
  9. end
  10. end
  11. 1 describe 'navbar' do
  12. 2 let(:books_category) { create(:books_category) }
  13. 1 it 'on click home move to root-path' do
  14. 1 visit books_path
  15. 1 find('a', id: 'root').click
  16. 1 expect(page).to have_content('Get Started')
  17. end
  18. 1 it 'on click category name move to root-path with books that belong to this category' do
  19. 1 books_category
  20. 1 visit root_path
  21. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
  22. 1 within('ul', id: 'nav') do
  23. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
  24. end
  25. 1 expect(page).to have_content(books_category.category.books.first.title)
  26. end
  27. 1 context 'when guest' do
  28. 1 it 'on click login go to login page' do
  29. 1 visit root_path
  30. 1 within 'div', class: 'visible-xs' do
  31. 1 click_link I18n.t('header.log_in')
  32. end
  33. 1 expect(page).to have_content(I18n.t('header.log_in'))
  34. end
  35. 1 it 'on click sing up go to sing up page' do
  36. 1 visit root_path
  37. 1 within 'div', class: 'visible-xs' do
  38. 1 click_link I18n.t('header.sing_up')
  39. end
  40. 1 expect(page).to have_content(I18n.t('header.sing_up'))
  41. end
  42. end
  43. 1 context 'when user', js: true do
  44. 4 let(:user) { create(:user) }
  45. 1 before do
  46. 3 sign_in(user)
  47. end
  48. 1 it 'on click account show settings' do
  49. 1 visit root_path
  50. 1 click_on I18n.t('header.account')
  51. 1 expect(page).to have_content(I18n.t('header.settings'))
  52. end
  53. 1 it 'on click account show log_out' do
  54. 1 visit root_path
  55. 1 click_on I18n.t('header.account')
  56. 1 expect(page).to have_content(I18n.t('header.log_out'))
  57. end
  58. 1 it 'log_out' do
  59. 1 visit root_path
  60. 1 click_on I18n.t('header.account')
  61. 1 click_on(I18n.t('header.log_out'), match: :first)
  62. 1 expect(page).to have_content(I18n.t('devise.sessions.signed_out'))
  63. end
  64. end
  65. end
  66. end

spec/feature/login_spec.rb

100.0% lines covered

19 relevant lines. 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e7b845 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 49e3b70 (Fix) ======= 19 lines covered and 0 lines missed. >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD ======= >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix)
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) RSpec.describe 'Login', type: :feature do
  2. 3 let(:user_second) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#login' do
  4. 1 before do
  5. 2 visit new_user_session_path
  6. end
  7. 1 context 'when successfully login' do
  8. 1 it 'login' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: user_second.email
  11. 1 fill_in 'user_password', with: user_second.password
  12. 1 click_on I18n.t('header.log_in')
  13. end
  14. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  15. end
  16. end
  17. 1 context 'when unsuccessfully login' do
  18. 1 it 'didn`t login' do
  19. 1 within 'form', class: 'new_user', id: 'new_user' do
  20. 1 fill_in 'user_email', with: user_second.email
  21. 1 fill_in 'user_password', with: 'wrong_password'
  22. 1 click_on I18n.t('header.log_in')
  23. end
  24. 1 expect(page).to have_text 'Invalid Email or password.'
  25. end
  26. end
  27. end
  28. end

spec/feature/new_password_spec.rb

100.0% lines covered

13 relevant lines. 13 lines covered and 0 lines missed.
    
  1. 1 require_relative '../rails_helper' ======= ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5f76842 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ea0650c (Featire specs) >>>>>>> a2de409 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a038b16 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d7fadcd (Featire specs) >>>>>>> 95ebdc2 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) =======
  3. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  4. >>>>>>> 998f08d (Manifest_cache true) ======= =======
  5. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= =======
  6. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) require_relative '../support/shared_context'
  7. 1 RSpec.describe 'New Password', type: :feature do
  8. 3 let(:user) { FactoryBot.create(:user) }
  9. 1 describe '#new_password' do
  10. 1 it 'change password' do
  11. 1 user.reset_password('newPassword', 'newPassword')
  12. 1 expect(user.password).to eq('newPassword')
  13. end
  14. 1 it 'not validate password' do
  15. 1 visit new_user_password_path
  16. 1 fill_in 'email', with: user.email
  17. 1 click_on I18n.t('login.send_instructions')
  18. 1 expect(page).to have_content(I18n.t('devise.passwords.send_instructions'))
  19. end
  20. end
  21. end

spec/feature/registration_spec.rb

100.0% lines covered

29 relevant lines. 29 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Registration', type: :feature do
  2. 3 let(:user) { create(:user, email: 'test.rspec@rspec.ua') }
  3. 1 describe '#sing_up' do
  4. 1 before do
  5. 3 visit new_user_registration_path
  6. end
  7. 1 context 'when successfully sing_up' do
  8. 1 it 'sing_up users' do
  9. 1 within 'form', class: 'new_user', id: 'new_user' do
  10. 1 fill_in 'user_email', with: 'email-test@rspec.com'
  11. 1 fill_in 'user_password', with: user.password
  12. 1 fill_in 'user_password_confirmation', with: user.password
  13. 1 click_on I18n.t('header.sing_up')
  14. end
  15. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  16. end
  17. end
  18. 1 context 'when users is already exits' do
  19. 1 it 'sing_up users' do
  20. 1 within 'form', class: 'new_user', id: 'new_user' do
  21. 1 fill_in 'user_email', with: user.email
  22. 1 fill_in 'user_password', with: user.password
  23. 1 fill_in 'user_password_confirmation', with: user.password
  24. 1 click_on I18n.t('header.sing_up')
  25. end
  26. 1 expect(page).to have_text('Email has already been taken')
  27. end
  28. end
  29. 1 context 'when unsuccessfully sing_up' do
  30. 1 it 'didn`t sing_up' do
  31. 1 within 'form', class: 'new_user', id: 'new_user' do
  32. 1 fill_in 'user_email', with: FFaker::Internet.email
  33. 1 fill_in 'user_password', with: 'password'
  34. 1 fill_in 'user_password_confirmation', with: 'wrong'
  35. 1 click_on I18n.t('header.sing_up')
  36. end
  37. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  38. end
  39. end
  40. end
  41. end

spec/feature/review_spec.rb

100.0% lines covered

30 relevant lines. 30 lines covered and 0 lines missed.
    
  1. 1 require_relative '../rails_helper'
  2. 1 require_relative '../support/shared_context'
  3. 1 RSpec.describe 'Review', type: :feature do
  4. 1 include_context 'with api request authentication helper methods'
  5. 1 include_context 'with api request global before and after hooks'
  6. 3 let(:user) { FactoryBot.create(:user).decorate }
  7. 3 let(:book) { FactoryBot.create(:book).decorate }
  8. 1 before do
  9. 2 sign_in(user)
  10. 2 visit book_path(book)
  11. end
  12. 1 shared_examples 'review' do
  13. 2 it 'review' do
  14. 2 find('i', id: rating).click
  15. 2 fill_in :title, with: FFaker::Lorem.sentence(title_words)
  16. 2 fill_in :body, with: FFaker::Lorem.sentence(body_words)
  17. 2 click_on I18n.t('review.post')
  18. 2 expect(page).to have_content(result)
  19. end
  20. end
  21. 1 describe '#post review', js: true do
  22. 1 context 'when review posted' do
  23. 2 let(:rating) { "star#{rand(1..5)}" }
  24. 2 let(:title_words) { 5 }
  25. 2 let(:body_words) { 10 }
  26. 2 let(:result) { user.name_or_email }
  27. 1 include_examples 'review'
  28. end
  29. 1 context 'when review not been posted' do
  30. 2 let(:rating) { "star#{rand(1..5)}" }
  31. 2 let(:title_words) { 80 }
  32. 2 let(:body_words) { 30 }
  33. 2 let(:result) { 'Title is too long (maximum is 80 characters)' }
  34. 1 include_examples 'review'
  35. end
  36. end
  37. end

spec/feature/settings_spec.rb

100.0% lines covered

34 relevant lines. 34 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'Settings', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 4 let(:user) { create(:user) }
  5. 1 before do
  6. 3 sign_in(user)
  7. 3 visit edit_user_path(user.id)
  8. 3 click_link I18n.t('settings.privacy')
  9. end
  10. 1 describe '#email_change' do
  11. 1 it 'change email' do
  12. 1 within('div', id: 'email') do
  13. 1 fill_in :email, with: FFaker::Internet.email
  14. 1 click_on I18n.t('settings.save')
  15. end
  16. 1 user.confirm
  17. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  18. end
  19. end
  20. 1 describe '#password_change' do
  21. 1 context 'when error' do
  22. 1 it 'didnt change password' do
  23. 1 within('div', id: 'password') do
  24. 1 fill_in :current_password, with: user.password
  25. 1 fill_in :password, with: 'newPassword'
  26. 1 fill_in :password_confirmation, with: 'incorrectPassword'
  27. 1 click_on I18n.t('settings.save')
  28. end
  29. 1 user.confirm
  30. 1 expect(page).to have_content(I18n.t('settings.error.error'))
  31. end
  32. end
  33. 1 context 'when successful' do
  34. 1 it 'didnt change password' do
  35. 1 within('div', id: 'password') do
  36. 1 fill_in :current_password, with: user.password
  37. 1 fill_in :password, with: 'newPassword'
  38. 1 fill_in :password_confirmation, with: 'newPassword'
  39. 1 click_on I18n.t('settings.save')
  40. end
  41. 1 user.confirm
  42. 1 expect(page).to have_content(I18n.t('devise.failure.unauthenticated'))
  43. end
  44. end
  45. end
  46. end

spec/feature/shipping_spec.rb

73.08% lines covered

26 relevant lines. 19 lines covered and 7 lines missed.
    
  1. 1 RSpec.describe 'Shipping', type: :feature do
  2. 1 include_context 'with api request authentication helper methods'
  3. 1 include_context 'with api request global before and after hooks'
  4. 2 let(:user) { FactoryBot.create(:user) }
  5. 1 let(:attributes_for) { attributes_for(:shipping) }
  6. 1 describe '#fill_in', js: true do
  7. 1 it 'fill in shipping' do
  8. 1 sign_in(user)
  9. 1 visit edit_user_path(user.id)
  10. 1 within('div#shipping.col-md-5.mb-40') do
  11. 1 find_all('div', class: 'form-group')[0] do
  12. fill_in :first_name, with: attributes_for[:first_name]
  13. end
  14. 1 find_all('div', class: 'form-group')[1] do
  15. fill_in :last_name, with: attributes_for[:last_name]
  16. end
  17. 1 find_all('div', class: 'form-group')[2] do
  18. fill_in :address, with: attributes_for[:address]
  19. end
  20. 1 find_all('div', class: 'form-group')[3] do
  21. fill_in :city, with: attributes_for[:city]
  22. end
  23. 1 find_all('div', class: 'form-group')[4] do
  24. fill_in :zip, with: attributes_for[:zip]
  25. end
  26. 1 find_all('div', class: 'form-group')[5] do
  27. fill_in :country, with: attributes_for[:country]
  28. end
  29. 1 find_all('div', class: 'form-group')[6] do
  30. fill_in :phone, with: attributes_for[:phone]
  31. end
  32. 1 click_on I18n.t('settings.save')
  33. end
  34. 1 expect(page).to have_content(I18n.t('settings.message.update'))
  35. end
  36. end
  37. end

spec/feature/user_spec.rb

100.0% lines covered

42 relevant lines. 42 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe 'User', type: :feature do
  2. 2 let(:user) { build(:user, email: 'test.rspec@rspec.ua') }
  3. 3 let(:user_second) { create(:user, email: 'test.rspec-test@rspec.ua') }
  4. 1 describe '#sing_up' do
  5. 1 context 'when successfully sing_up' do
  6. 1 before do
  7. 1 visit new_user_registration_path
  8. 1 within 'form', class: 'new_user', id: 'new_user' do
  9. 1 fill_in 'user_email', with: user.email
  10. 1 fill_in 'user_password', with: user.password
  11. 1 fill_in 'user_password_confirmation', with: user.password
  12. 1 click_on I18n.t('header.sing_up')
  13. end
  14. end
  15. 1 it 'sing_up user' do
  16. 1 expect(page).to have_text I18n.t('devise.registrations.signed_up_but_unconfirmed')
  17. end
  18. end
  19. 1 context 'when unsuccessfully sing_up' do
  20. 1 it 'didn`t sing_up' do
  21. 1 visit new_user_registration_path
  22. 1 within 'form', class: 'new_user', id: 'new_user' do
  23. 1 fill_in 'user_email', with: FFaker::Internet.email
  24. 1 fill_in 'user_password', with: 'wrong'
  25. 1 fill_in 'user_password_confirmation', with: 'wrong'
  26. 1 click_on I18n.t('header.sing_up')
  27. end
  28. 1 expect(page).to have_text '1 error prohibited this user from being saved'
  29. end
  30. end
  31. end
  32. 1 describe '#login' do
  33. 1 before do
  34. 2 user_second.confirm
  35. end
  36. 1 context 'when successfully login' do
  37. 1 it 'login' do
  38. 1 visit new_user_session_path
  39. 1 within 'form', class: 'new_user', id: 'new_user' do
  40. 1 fill_in 'user_email', with: user_second.email
  41. 1 fill_in 'user_password', with: user_second.password
  42. 1 click_on I18n.t('header.log_in')
  43. end
  44. 1 expect(page).to have_text I18n.t('devise.sessions.signed_in')
  45. end
  46. end
  47. 1 context 'when unsuccessfully login' do
  48. 1 it 'didn`t login' do
  49. 1 visit new_user_session_path
  50. 1 within 'form', class: 'new_user', id: 'new_user' do
  51. 1 fill_in 'user_email', with: user_second.email
  52. 1 fill_in 'user_password', with: 'wrong_password'
  53. 1 click_on I18n.t('header.log_in')
  54. end
  55. 1 expect(page).to have_text 'Invalid Email or password.'
  56. end
  57. end
  58. end
  59. end

spec/models/admin_user_spec.rb

100.0% lines covered

5 relevant lines. 5 lines covered and ======= 20 relevant lines. 20 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 20 relevant lines. 20 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= 20 relevant lines. 20 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) RSpec.describe AdminUser, type: :model do ======= RSpec.describe 'Homes', type: :feature do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) ======= RSpec.describe 'Homes', type: :feature do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe 'Homes', type: :feature do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) context 'when validations' do ======= describe 'Get Started' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'Get Started' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) ======= describe 'Get Started' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) ======= describe 'Get Started' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= describe 'Get Started' do >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= describe 'Get Started' do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  5. 2 =======
  6. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======
  7. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) =======
  8. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======
  9. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) =======
  10. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
  11. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  12. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:email) } ======= it 'on click move to catalog page' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) ======= it 'on click move to catalog page' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= it 'on click move to catalog page' do >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= it 'on click move to catalog page' do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  13. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  14. 2 =======
  15. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======
  16. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) =======
  17. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======
  18. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) =======
  19. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
  20. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  21. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:password) } ======= visit root_path >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= visit root_path >>>>>>> 752f0c0 (Featire specs) ======= visit root_path >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= visit root_path >>>>>>> 08edf50 (Featire specs) ======= visit root_path >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= visit root_path >>>>>>> 7a02bbe (Featire specs) ======= visit root_path >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= visit root_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= visit root_path >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= visit root_path >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= visit root_path >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= visit root_path >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= visit root_path >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  23. 1 <<<<<<< HEAD <<<<<<< HEAD context 'when associations' do ======= click_on 'Get Started' >>>>>>> 93bdda9 (Featire specs) ======= click_on 'Get Started' >>>>>>> 2a25e4c (Featire specs)
  24. <<<<<<< HEAD <<<<<<< HEAD
  25. 2 =======
  26. >>>>>>> 93bdda9 (Featire specs) =======
  27. >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs)
  28. <<<<<<< HEAD <<<<<<< HEAD
  29. 2 =======
  30. 1 >>>>>>> 93bdda9 (Featire specs) =======
  31. 1 >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to have_many(:books).through(:authors_books) } ======= expect(page).to have_content('Catalog') >>>>>>> 93bdda9 (Featire specs) ======= expect(page).to have_content('Catalog') >>>>>>> 2a25e4c (Featire specs)
  32. end
  33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) end
  34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  35. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  36. ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  37. ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  38. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs)
  39. 1 describe 'navbar' do
  40. 2 let(:books_category) { FactoryBot.create(:books_category) }
  41. 1 it 'on click home move to root-path' do
  42. 1 visit books_path
  43. 1 find('a', id: 'root').click
  44. 1 expect(page).to have_content('Get Started')
  45. end
  46. 1 it 'on click category name move to root-path with books that belong to this category' do
  47. 1 books_category
  48. 1 visit root_path
  49. 1 find('a', class: 'dropdown-toggle', text: 'Shop').click
  50. 1 within('ul', id: 'nav') do
  51. 1 find('a', class: 'collapse-link', text: books_category.category.name).click
  52. end
  53. 1 expect(page).to have_content(books_category.category.books.first.title)
  54. end
  55. end
  56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) end

spec/models/author_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) RSpec.describe Author, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  3. 1 describe 'author' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:first_name) }
  6. 2 it { is_expected.to validate_presence_of(:last_name) }
  7. end
  8. =======
  9. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  10. >>>>>>> 752f0c0 (Featire specs) =======
  11. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  12. >>>>>>> 08edf50 (Featire specs) =======
  13. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  14. >>>>>>> 7a02bbe (Featire specs) =======
  15. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  16. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  17. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  18. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  19. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  20. =======
  21. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  22. >>>>>>> 752f0c0 (Featire specs) =======
  23. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  24. >>>>>>> 08edf50 (Featire specs) =======
  25. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  26. >>>>>>> 7a02bbe (Featire specs) =======
  27. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  28. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  29. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  30. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) context 'when associations' do ======= RSpec.describe Author, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  31. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  32. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  33. ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  34. 1 describe 'author' do
  35. 1 context 'when validations' do
  36. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  37. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  38. =======
  39. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  40. >>>>>>> 752f0c0 (Featire specs) =======
  41. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  42. >>>>>>> 08edf50 (Featire specs) =======
  43. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  44. >>>>>>> 7a02bbe (Featire specs) =======
  45. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  46. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  47. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  48. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:books).through(:authors_books) } ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  50. =======
  51. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  52. >>>>>>> 752f0c0 (Featire specs) =======
  53. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  54. >>>>>>> 08edf50 (Featire specs) =======
  55. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  56. >>>>>>> 7a02bbe (Featire specs) =======
  57. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  58. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  59. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  60. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) end
  61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  62. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  63. ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  64. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  65. 1 context 'when associations' do
  66. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  67. 2 it { is_expected.to have_many(:books).through(:authors_books) }
  68. end
  69. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  70. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= =======
  71. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  72. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  73. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  74. =======
  75. >>>>>>> d0dc1f1 (Featire specs) =======
  76. >>>>>>> 752f0c0 (Featire specs) =======
  77. >>>>>>> 4e81ea2 (Featire specs) =======
  78. >>>>>>> 08edf50 (Featire specs) =======
  79. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  80. >>>>>>> 7a02bbe (Featire specs) =======
  81. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD context 'when associations' do ======= RSpec.describe Author, type: :model do >>>>>>> d0dc1f1 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 4e81ea2 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= RSpec.describe Author, type: :model do >>>>>>> 7a02bbe (Featire specs) ======= RSpec.describe Author, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased)
  82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  83. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  84. =======
  85. >>>>>>> 1577aeb (Rebased) 1 describe 'author' do
  86. 1 context 'when validations' do
  87. <<<<<<< HEAD
  88. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  89. >>>>>>> 1577aeb (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to have_many(:authors_books).dependent(:destroy) } ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:first_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  90. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  91. ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD
  92. =======
  93. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= =======
  94. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= =======
  95. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= =======
  96. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= =======
  97. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  98. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= =======
  99. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  100. >>>>>>> 1577aeb (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to have_many(:books).through(:authors_books) } ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:last_name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  101. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  102. =======
  103. >>>>>>> d0dc1f1 (Featire specs) =======
  104. >>>>>>> 752f0c0 (Featire specs) =======
  105. >>>>>>> 4e81ea2 (Featire specs) =======
  106. >>>>>>> 08edf50 (Featire specs) =======
  107. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  108. >>>>>>> 7a02bbe (Featire specs) =======
  109. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  110. =======
  111. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= =======
  112. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= =======
  113. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= =======
  114. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= =======
  115. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  116. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= =======
  117. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  118. >>>>>>> 1577aeb (Rebased) end
  119. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  120. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) <<<<<<< HEAD
  121. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  122. =======
  123. >>>>>>> 1577aeb (Rebased)
  124. 1 context 'when associations' do
  125. 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  126. 2 it { is_expected.to have_many(:books).through(:authors_books) }
  127. end
  128. <<<<<<< HEAD
  129. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  130. >>>>>>> 1577aeb (Rebased) end
  131. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  132. =======
  133. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  134. >>>>>>> 752f0c0 (Featire specs) =======
  135. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  136. >>>>>>> 08edf50 (Featire specs) =======
  137. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  138. >>>>>>> 7a02bbe (Featire specs) =======
  139. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  140. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= =======
  141. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  142. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) end

spec/models/authors_book_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) 8 relevant lines. 8 lines covered and ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 8 relevant lines. 8 lines covered and >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) RSpec.describe AuthorsBook, type: :model do
  3. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  4. =======
  5. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  6. >>>>>>> 752f0c0 (Featire specs) =======
  7. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  8. >>>>>>> 08edf50 (Featire specs) =======
  9. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  10. >>>>>>> 7a02bbe (Featire specs) =======
  11. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  12. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  13. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  14. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  15. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  16. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= =======
  17. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  18. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) 1 describe 'authors_book' do
  19. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  20. =======
  21. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  22. >>>>>>> 752f0c0 (Featire specs) =======
  23. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  24. >>>>>>> 08edf50 (Featire specs) =======
  25. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  26. >>>>>>> 7a02bbe (Featire specs) =======
  27. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  28. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  29. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  30. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  31. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  32. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= =======
  33. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  34. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) 1 context 'when validations' do
  35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  36. 2 it { is_expected.to validate_presence_of(:book) }
  37. 2 it { is_expected.to validate_presence_of(:author) }
  38. end
  39. 1 context 'when associations' do
  40. 2 it { is_expected.to belong_to(:author) }
  41. <<<<<<< HEAD <<<<<<< HEAD 2 it { is_expected.to belong_to(:book) }
  42. end
  43. end
  44. ======= >>>>>>> 1577aeb (Rebased)
  45. end

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Billing, type: :model do
  2. 1 describe 'billing' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased)
  7. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } >>>>>>> 1577aeb (Rebased)
  8. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } >>>>>>> 1577aeb (Rebased)
  9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased)
  10. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  11. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  12. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  13. <<<<<<< HEAD =======
  14. >>>>>>> d0dc1f1 (Featire specs) =======
  15. >>>>>>> 752f0c0 (Featire specs) =======
  16. >>>>>>> 4e81ea2 (Featire specs) =======
  17. >>>>>>> 08edf50 (Featire specs) =======
  18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  19. >>>>>>> 7a02bbe (Featire specs) =======
  20. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) end
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  22. =======
  23. >>>>>>> d0dc1f1 (Featire specs) =======
  24. >>>>>>> 752f0c0 (Featire specs) =======
  25. >>>>>>> 4e81ea2 (Featire specs) =======
  26. >>>>>>> 08edf50 (Featire specs) =======
  27. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  28. >>>>>>> 7a02bbe (Featire specs) =======
  29. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  30. >>>>>>> 1577aeb (Rebased)
  31. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1577aeb (Rebased)
  32. 1 context 'when not validations' do
  33. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  34. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  35. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  36. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  37. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  38. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  39. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  40. end
  41. <<<<<<< HEAD =======
  42. >>>>>>> d0dc1f1 (Featire specs) =======
  43. >>>>>>> 752f0c0 (Featire specs) =======
  44. >>>>>>> 4e81ea2 (Featire specs) =======
  45. >>>>>>> 08edf50 (Featire specs) =======
  46. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  47. >>>>>>> 7a02bbe (Featire specs) =======
  48. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) 1 context 'when associations' do
  49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  50. =======
  51. >>>>>>> d0dc1f1 (Featire specs) =======
  52. >>>>>>> 752f0c0 (Featire specs) =======
  53. >>>>>>> 4e81ea2 (Featire specs) =======
  54. >>>>>>> 08edf50 (Featire specs) =======
  55. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  56. >>>>>>> 7a02bbe (Featire specs) =======
  57. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  58. >>>>>>> 1577aeb (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to belong_to(:user) } ======= it { is_expected.to belong_to(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:user) } >>>>>>> 1577aeb (Rebased)
  59. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  60. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  61. ======= >>>>>>> ee78f39 (Rebased) 2 it { is_expected.to belong_to(:book) }
  62. <<<<<<< HEAD
  63. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  64. >>>>>>> ee78f39 (Rebased) =======
  65. >>>>>>> 1577aeb (Rebased) end
  66. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  67. =======
  68. >>>>>>> d0dc1f1 (Featire specs) =======
  69. >>>>>>> 752f0c0 (Featire specs) =======
  70. >>>>>>> 4e81ea2 (Featire specs) =======
  71. >>>>>>> 08edf50 (Featire specs) =======
  72. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  73. >>>>>>> 7a02bbe (Featire specs) =======
  74. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  75. >>>>>>> ee78f39 (Rebased) =======
  76. >>>>>>> 1577aeb (Rebased) end
  77. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  78. =======
  79. >>>>>>> d0dc1f1 (Featire specs) =======
  80. >>>>>>> 752f0c0 (Featire specs) =======
  81. >>>>>>> 4e81ea2 (Featire specs) =======
  82. >>>>>>> 08edf50 (Featire specs) =======
  83. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  84. >>>>>>> 7a02bbe (Featire specs) =======
  85. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  86. end

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Billing, type: :model do
  2. 1 describe 'billing' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  7. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  8. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  10. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  11. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  12. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  13. =======
  14. >>>>>>> d0dc1f1 (Featire specs) =======
  15. >>>>>>> 752f0c0 (Featire specs) =======
  16. >>>>>>> 4e81ea2 (Featire specs) =======
  17. >>>>>>> 08edf50 (Featire specs) =======
  18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  19. >>>>>>> 7a02bbe (Featire specs) =======
  20. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  22. =======
  23. >>>>>>> d0dc1f1 (Featire specs) =======
  24. >>>>>>> 752f0c0 (Featire specs) =======
  25. >>>>>>> 4e81ea2 (Featire specs) =======
  26. >>>>>>> 08edf50 (Featire specs) =======
  27. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  28. >>>>>>> 7a02bbe (Featire specs) =======
  29. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  31. 1 context 'when not validations' do
  32. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  33. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  34. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  35. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  36. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  37. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  38. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  39. end
  40. =======
  41. >>>>>>> d0dc1f1 (Featire specs) =======
  42. >>>>>>> 752f0c0 (Featire specs) =======
  43. >>>>>>> 4e81ea2 (Featire specs) =======
  44. >>>>>>> 08edf50 (Featire specs) =======
  45. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  46. >>>>>>> 7a02bbe (Featire specs) =======
  47. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 context 'when associations' do
  48. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  49. =======
  50. >>>>>>> d0dc1f1 (Featire specs) =======
  51. >>>>>>> 752f0c0 (Featire specs) =======
  52. >>>>>>> 4e81ea2 (Featire specs) =======
  53. >>>>>>> 08edf50 (Featire specs) =======
  54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  55. >>>>>>> 7a02bbe (Featire specs) =======
  56. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to belong_to(:user) } ======= it { is_expected.to belong_to(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  57. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  58. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  59. ======= >>>>>>> 836a973 (Rebased) 2 it { is_expected.to belong_to(:book) }
  60. <<<<<<< HEAD
  61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  62. >>>>>>> 836a973 (Rebased) end
  63. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  64. =======
  65. >>>>>>> d0dc1f1 (Featire specs) =======
  66. >>>>>>> 752f0c0 (Featire specs) =======
  67. >>>>>>> 4e81ea2 (Featire specs) =======
  68. >>>>>>> 08edf50 (Featire specs) =======
  69. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  70. >>>>>>> 7a02bbe (Featire specs) =======
  71. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  72. >>>>>>> 836a973 (Rebased) end
  73. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  74. <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= =======
  75. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= =======
  76. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= =======
  77. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= =======
  78. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= =======
  79. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  80. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= =======
  81. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  82. end

spec/models/billing_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Billing, type: :model do
  2. 1 describe 'billing' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  7. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  8. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) } ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  10. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  11. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  12. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  13. =======
  14. >>>>>>> d0dc1f1 (Featire specs) =======
  15. >>>>>>> 752f0c0 (Featire specs) =======
  16. >>>>>>> 4e81ea2 (Featire specs) =======
  17. >>>>>>> 08edf50 (Featire specs) =======
  18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  19. >>>>>>> 7a02bbe (Featire specs) =======
  20. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  21. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  22. =======
  23. >>>>>>> d0dc1f1 (Featire specs) =======
  24. >>>>>>> 752f0c0 (Featire specs) =======
  25. >>>>>>> 4e81ea2 (Featire specs) =======
  26. >>>>>>> 08edf50 (Featire specs) =======
  27. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  28. >>>>>>> 7a02bbe (Featire specs) =======
  29. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  30. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  31. 1 context 'when not validations' do
  32. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  33. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  34. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  35. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  36. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  37. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  38. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  39. end
  40. =======
  41. >>>>>>> d0dc1f1 (Featire specs) =======
  42. >>>>>>> 752f0c0 (Featire specs) =======
  43. >>>>>>> 4e81ea2 (Featire specs) =======
  44. >>>>>>> 08edf50 (Featire specs) =======
  45. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  46. >>>>>>> 7a02bbe (Featire specs) =======
  47. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 1 context 'when associations' do
  48. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  49. =======
  50. >>>>>>> d0dc1f1 (Featire specs) =======
  51. >>>>>>> 752f0c0 (Featire specs) =======
  52. >>>>>>> 4e81ea2 (Featire specs) =======
  53. >>>>>>> 08edf50 (Featire specs) =======
  54. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  55. >>>>>>> 7a02bbe (Featire specs) =======
  56. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to belong_to(:user) } ======= it { is_expected.to belong_to(:author) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to belong_to(:author) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to belong_to(:author) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  57. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  58. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  59. 2 it { is_expected.to belong_to(:book) }
  60. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  62. =======
  63. >>>>>>> d0dc1f1 (Featire specs) =======
  64. >>>>>>> 752f0c0 (Featire specs) =======
  65. >>>>>>> 4e81ea2 (Featire specs) =======
  66. >>>>>>> 08edf50 (Featire specs) =======
  67. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  68. >>>>>>> 7a02bbe (Featire specs) =======
  69. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) end
  70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  71. <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= =======
  72. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= =======
  73. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= =======
  74. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= =======
  75. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= =======
  76. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  77. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= =======
  78. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  79. >>>>>>> 1577aeb (Rebased) end

spec/models/book_spec.rb

100.0% lines covered

16 relevant lines. 16 lines covered and 0 lines missed.
    
  1. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD RSpec.describe Book, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  2. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  3. 1 =======
  4. >>>>>>> d0dc1f1 (Featire specs) =======
  5. >>>>>>> 752f0c0 (Featire specs) =======
  6. >>>>>>> 4e81ea2 (Featire specs) =======
  7. >>>>>>> 08edf50 (Featire specs) =======
  8. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  9. >>>>>>> 7a02bbe (Featire specs) =======
  10. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe 'books' do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  11. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) RSpec.describe Book, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  12. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  13. 1 =======
  14. >>>>>>> d0dc1f1 (Featire specs) =======
  15. >>>>>>> 752f0c0 (Featire specs) =======
  16. >>>>>>> 4e81ea2 (Featire specs) =======
  17. >>>>>>> 08edf50 (Featire specs) =======
  18. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  19. >>>>>>> 7a02bbe (Featire specs) =======
  20. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe 'books' do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  21. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) RSpec.describe Book, type: :model do ======= require 'rails_helper' >>>>>>> d0dc1f1 (Featire specs) ======= require 'rails_helper' >>>>>>> 752f0c0 (Featire specs) ======= require 'rails_helper' >>>>>>> 4e81ea2 (Featire specs) ======= require 'rails_helper' >>>>>>> 08edf50 (Featire specs) ======= require 'rails_helper' >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= require 'rails_helper' >>>>>>> 7a02bbe (Featire specs) ======= require 'rails_helper' >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  23. 1 =======
  24. >>>>>>> d0dc1f1 (Featire specs) =======
  25. >>>>>>> 752f0c0 (Featire specs) =======
  26. >>>>>>> 4e81ea2 (Featire specs) =======
  27. >>>>>>> 08edf50 (Featire specs) =======
  28. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) =======
  29. >>>>>>> 7a02bbe (Featire specs) =======
  30. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD describe 'books' do ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  31. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) RSpec.describe Book, type: :model do
  32. 1 describe 'books' do
  33. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) context 'when validations' do
  34. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased)
  35. 2 it { is_expected.to validate_presence_of(:title) }
  36. 2 it { is_expected.to validate_presence_of(:description) }
  37. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  38. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  39. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:year_of_publication) } ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD
  40. =======
  41. >>>>>>> ee78f39 (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:quantity) } ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } >>>>>>> ee78f39 (Rebased)
  42. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:materials) } ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  43. =======
  44. >>>>>>> 836a973 (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) } ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } >>>>>>> 836a973 (Rebased)
  45. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:materials) } ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:description) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  46. =======
  47. >>>>>>> 1577aeb (Rebased) 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) } ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:price) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= it { is_expected.to allow_values(Constants::MIN_PRICE_IN_CENTS, Constants::MAX_PRICE_IN_CENTS).for(:price_cents) } >>>>>>> 1577aeb (Rebased)
  48. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD it { is_expected.to validate_presence_of(:materials) } ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:year_of_publication) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  49. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:quantity) }
  50. 2 it { is_expected.to validate_presence_of(:materials) }
  51. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:dimensions) }
  52. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  53. =======
  54. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  55. >>>>>>> 752f0c0 (Featire specs) =======
  56. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  57. >>>>>>> 08edf50 (Featire specs) =======
  58. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  59. >>>>>>> 7a02bbe (Featire specs) =======
  60. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  61. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  62. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  63. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  64. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  65. >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  66. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= =======
  67. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  68. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  69. >>>>>>> 1577aeb (Rebased) end
  70. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  71. =======
  72. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  73. >>>>>>> 752f0c0 (Featire specs) =======
  74. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  75. >>>>>>> 08edf50 (Featire specs) =======
  76. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  77. >>>>>>> 7a02bbe (Featire specs) =======
  78. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  79. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  80. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  81. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  82. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  83. >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  84. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= =======
  85. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  86. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  87. >>>>>>> 1577aeb (Rebased)
  88. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  89. =======
  90. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  91. >>>>>>> 752f0c0 (Featire specs) =======
  92. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  93. >>>>>>> 08edf50 (Featire specs) =======
  94. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  95. >>>>>>> 7a02bbe (Featire specs) =======
  96. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  97. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  98. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  99. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  100. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  101. >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  102. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= =======
  103. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  104. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  105. >>>>>>> 1577aeb (Rebased) 1 context 'when associations' do
  106. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  107. =======
  108. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  109. >>>>>>> 752f0c0 (Featire specs) =======
  110. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  111. >>>>>>> 08edf50 (Featire specs) =======
  112. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  113. >>>>>>> 7a02bbe (Featire specs) =======
  114. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  115. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  116. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  117. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  118. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  119. >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  120. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= =======
  121. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  122. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  123. >>>>>>> 1577aeb (Rebased) 2 it { is_expected.to have_many(:authors_books).dependent(:destroy) }
  124. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  125. =======
  126. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  127. >>>>>>> 752f0c0 (Featire specs) =======
  128. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  129. >>>>>>> 08edf50 (Featire specs) =======
  130. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  131. >>>>>>> 7a02bbe (Featire specs) =======
  132. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  133. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  134. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  135. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  136. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  137. >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  138. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= =======
  139. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  140. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  141. >>>>>>> 1577aeb (Rebased) 2 it { is_expected.to have_many(:authors).through(:authors_books) }
  142. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  143. =======
  144. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  145. >>>>>>> 752f0c0 (Featire specs) =======
  146. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  147. >>>>>>> 08edf50 (Featire specs) =======
  148. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  149. >>>>>>> 7a02bbe (Featire specs) =======
  150. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  151. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  152. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  153. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  154. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  155. >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  156. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= =======
  157. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  158. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  159. >>>>>>> 1577aeb (Rebased)
  160. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  161. =======
  162. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  163. >>>>>>> 752f0c0 (Featire specs) =======
  164. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  165. >>>>>>> 08edf50 (Featire specs) =======
  166. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  167. >>>>>>> 7a02bbe (Featire specs) =======
  168. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  169. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  170. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  171. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  172. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  173. >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  174. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= =======
  175. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  176. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  177. >>>>>>> 1577aeb (Rebased) 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  178. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased)
  179. 2 it { is_expected.to have_many(:categories).through(:books_categories) }
  180. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased)
  181. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) it { is_expected.to have_many(:reviews).dependent(:destroy) } ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to have_many(:reviews).dependent(:destroy) } >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:reviews).dependent(:destroy) } >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to have_many(:categories).through(:books_categories) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_many(:reviews).dependent(:destroy) } >>>>>>> 1577aeb (Rebased)
  182. end
  183. end
  184. end

spec/models/books_category_spec.rb

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) 8 relevant lines. 8 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe BooksCategory, type: :model do
  2. 1 describe 'books_categories' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:book) }
  5. 2 it { is_expected.to validate_presence_of(:category) }
  6. end
  7. 1 context 'when associations' do
  8. 2 it { is_expected.to belong_to(:category) }
  9. 2 it { is_expected.to belong_to(:book) }
  10. end
  11. end
  12. end

spec/models/category_spec.rb

100.0% lines covered

7 relevant lines. 7 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Category, type: :model do
  2. 1 describe 'category' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to validate_presence_of(:name) }
  5. end
  6. 1 context 'when associations' do
  7. 2 it { is_expected.to have_many(:books_categories).dependent(:destroy) }
  8. 2 it { is_expected.to have_many(:books).through(:books_categories) }
  9. end
  10. end
  11. end

spec/models/review_spec.rb

100.0% lines covered

14 relevant lines. 14 lines covered and <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 9 relevant lines. 9 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= 9 relevant lines. 9 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) RSpec.describe Review, type: :model do ======= RSpec.describe BooksCategory, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) ======= RSpec.describe BooksCategory, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe Review, type: :model do >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= RSpec.describe Review, type: :model do >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe BooksCategory, type: :model do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= RSpec.describe Review, type: :model do >>>>>>> 1577aeb (Rebased)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) describe 'review' do ======= describe 'books_categories' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'books_categories' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) ======= describe 'books_categories' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) ======= describe 'books_categories' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= describe 'review' do >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= describe 'review' do >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= describe 'books_categories' do >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= describe 'books_categories' do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= describe 'review' do >>>>>>> 1577aeb (Rebased)
  4. 1 context 'when validations' do
  5. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) it { is_expected.to validate_presence_of(:title) } ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:book) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:title) } >>>>>>> 1577aeb (Rebased)
  6. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) it { is_expected.to validate_presence_of(:body) }
  7. 2 it { is_expected.to validate_presence_of(:rating) }
  8. 2 it { is_expected.to validate_presence_of(:verified) }
  9. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TITLE_LENGTH_MAX).for(:title) }
  10. 2 it { is_expected.to allow_values('a' * Constants::VALIDATES_TEXT_LENGTH_MAX).for(:body) }
  11. 2 it { is_expected.to allow_values(1, 2, 3, 4, 5).for(:rating) }
  12. end
  13. 1 context 'when associations' do
  14. 2 it { is_expected.to belong_to(:book) }
  15. 2 it { is_expected.to belong_to(:user) }
  16. end
  17. end
  18. end

spec/models/shipping_spec.rb

100.0% lines covered

20 relevant lines. 20 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe Shipping, type: :model do
  2. 1 describe 'shipping' do
  3. 1 context 'when validations' do
  4. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:first_name) }
  5. 2 it { is_expected.to allow_values(FFaker::Name.first_name).for(:last_name) }
  6. 2 it { is_expected.to allow_values('+919367788755', '8989829304', '+16308520397', '786-307-3615').for(:phone) }
  7. 2 it { is_expected.to allow_values(FFaker::AddressUK.country).for(:country) }
  8. 2 it { is_expected.to allow_values(FFaker::AddressUK.city).for(:city) }
  9. 2 it { is_expected.to allow_values(FFaker::AddressUA.zip_code).for(:zip) }
  10. 2 it { is_expected.to allow_values(FFaker::Address.street_address).for(:address) }
  11. end
  12. 1 context 'when not validations' do
  13. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:first_name) }
  14. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_NAME_LENGTH_MAX.next).for(:last_name) }
  15. 2 it { is_expected.not_to allow_values('789', '123765', '1-1-1', '+982').for(:phone) }
  16. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:country) }
  17. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:city) }
  18. 2 it { is_expected.not_to allow_values('1' * Constants::VALIDATES_ZIP_LENGTH_MAX.next).for(:zip) }
  19. 2 it { is_expected.not_to allow_values('A' * Constants::VALIDATES_TITLE_LENGTH_MAX.next).for(:address) }
  20. end
  21. 1 context 'when associations' do
  22. 2 it { is_expected.to belong_to(:user) }
  23. end
  24. end
  25. end

spec/models/user_spec.rb

100.0% lines covered

9 relevant lines. 9 lines covered and 0 lines missed.
    
  1. 1 RSpec.describe User, type: :model do
  2. 1 let(:user) { FactoryBot.create(:user) }
  3. 1 describe 'author' do
  4. 1 context 'when validations' do
  5. 2 it { is_expected.to validate_presence_of(:email) }
  6. 2 it { is_expected.to validate_presence_of(:password) } <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> d0dc1f1 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 4e81ea2 (Featire specs) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased)
  7. end
  8. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) context 'with associations' do ======= context 'when associations' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when associations' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) ======= context 'when associations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) ======= context 'when associations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= context 'with associations' do >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= context 'with associations' do >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= context 'when associations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= context 'when associations' do >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= context 'when associations' do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= context 'with associations' do >>>>>>> 1577aeb (Rebased)
  9. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) it { is_expected.to have_one(:billing) } ======= it { is_expected.to belong_to(:category) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to belong_to(:category) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to have_one(:billing) } >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_one(:billing) } >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:category) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_one(:billing) } >>>>>>> 1577aeb (Rebased)
  10. 2 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) it { is_expected.to have_one(:shipping) } ======= it { is_expected.to belong_to(:book) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to belong_to(:book) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to have_one(:shipping) } >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_one(:shipping) } >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to belong_to(:book) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= it { is_expected.to have_one(:shipping) } >>>>>>> 1577aeb (Rebased)
  11. end
  12. end
  13. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)

spec/queryes/book_query_spec.rb

=======

spec/models/category_spec.rb

>>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) =======

spec/models/category_spec.rb

>>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======

spec/models/category_spec.rb

>>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======

spec/models/category_spec.rb

>>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======

spec/queryes/book_query_spec.rb

>>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======

spec/queryes/book_query_spec.rb

>>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======

spec/queryes/book_query_spec.rb

>>>>>>> 1577aeb (Rebased)

100.0% lines covered

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) 45 relevant lines. 45 lines covered and ======= 8 relevant lines. 8 lines covered and >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= 8 relevant lines. 8 lines covered and >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= 8 relevant lines. 8 lines covered and >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= 45 relevant lines. 45 lines covered and >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= 45 relevant lines. 45 lines covered and >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= 45 relevant lines. 45 lines covered and >>>>>>> 1577aeb (Rebased) 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) RSpec.describe BookQuery do ======= RSpec.describe Category, type: :model do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) ======= RSpec.describe Category, type: :model do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.describe BookQuery do >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= RSpec.describe BookQuery do >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= RSpec.describe Category, type: :model do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= RSpec.describe BookQuery do >>>>>>> 1577aeb (Rebased)
  3. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) shared_examples 'sort test' do ======= describe 'category' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) ======= describe 'category' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) ======= describe 'category' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) ======= describe 'category' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= shared_examples 'sort test' do >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= shared_examples 'sort test' do >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= describe 'category' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= describe 'category' do >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= describe 'category' do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= shared_examples 'sort test' do >>>>>>> 1577aeb (Rebased)
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  5. 5 =======
  6. 1 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======
  7. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) =======
  8. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======
  9. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) =======
  10. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
  11. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  12. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  13. 5 >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  14. 5 >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  15. 5 >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) it 'sort' do ======= context 'when validations' do >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) ======= context 'when validations' do >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) ======= context 'when validations' do >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) ======= context 'when validations' do >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= it 'sort' do >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= it 'sort' do >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= context 'when validations' do >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= context 'when validations' do >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= context 'when validations' do >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= it 'sort' do >>>>>>> 1577aeb (Rebased)
  16. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  17. 5 =======
  18. 2 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======
  19. 2 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) =======
  20. 2 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======
  21. 2 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) =======
  22. 2 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
  23. 2 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  24. 2 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  25. 5 >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  26. 5 >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  27. 5 >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) books ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= books >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= books >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= it { is_expected.to validate_presence_of(:name) } >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= books >>>>>>> 1577aeb (Rebased)
  28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  29. 5 expect(test).to eq(result)
  30. =======
  31. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  32. >>>>>>> 752f0c0 (Featire specs) =======
  33. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  34. >>>>>>> 08edf50 (Featire specs) =======
  35. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  36. >>>>>>> 7a02bbe (Featire specs) =======
  37. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD =======
  38. 5 >>>>>>> ee78f39 (Rebased) expect(test).to eq(result)
  39. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  40. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  41. ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  42. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  43. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= =======
  44. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  45. 5 >>>>>>> 836a973 (Rebased) expect(test).to eq(result)
  46. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  47. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) =======
  48. >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  49. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  50. ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  51. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= =======
  52. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= =======
  53. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  54. 5 >>>>>>> 1577aeb (Rebased) expect(test).to eq(result)
  55. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  56. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  57. >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price)
  58. ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price)
  59. end
  60. <<<<<<< HEAD
  61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  62. >>>>>>> 1577aeb (Rebased) end
  63. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) >>>>>>> 9c0d812 (Featire specs) ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= ======= ======= <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased)
  64. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cb955a0 (Add login registration pages) ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d96cf3b (Featire specs) ======= >>>>>>> 83979de (Featire specs) ======= >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> 9ec6862 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> e50f73e (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 8be9029 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 03c0867 (Add login registration pages) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= ======= >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages)

spec/models/user_spec.rb

100.0% lines covered

3 relevant lines. 3 lines covered and 0 lines missed.
    
  1. 1 require 'rails_helper'
  2. 1 RSpec.describe User, type: :model do
  3. 1 pending "add some examples to (or delete) #{__FILE__}"
  4. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) ======= >>>>>>> 57a2e05 (Add login registration pages) ======= >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e50f73e (Add login registration pages) ======= >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 57a2e05 (Add login registration pages) >>>>>>> 45f9f35 (Add login registration pages) ======= >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages) >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 730a8ca (Add login registration pages) <<<<<<< HEAD >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD >>>>>>> b6a32ab (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 264ef06 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8be9029 (Add login registration pages) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 57a2e05 (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1a8477 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> cb955a0 (Add login registration pages) ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) <<<<<<< HEAD >>>>>>> 551615f (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 03c0867 (Add login registration pages) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 27ceb6f (Add login registration pages) ======= ======= >>>>>>> 730a8ca (Add login registration pages) >>>>>>> 22ee41c (Add login registration pages) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e50f73e (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> cb74525 (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 8be9029 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 7d58507 (Add login registration pages) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 03c0867 (Add login registration pages) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= <<<<<<< HEAD >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 1214e1f (Add login registration pages) >>>>>>> 9ec6862 (Add login registration pages) >>>>>>> 039806b (Add login registration pages) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f9f35 (Add login registration pages) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> e1f4d17 (Add login registration pages) >>>>>>> cacbab9 (Add login registration pages) >>>>>>> 697ad44 (Add login registration pages) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1214e1f (Add login registration pages) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) ======= >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 27ceb6f (Add login registration pages) ======= >>>>>>> cb955a0 (Add login registration pages)

spec/rails_helper.rb

87.5% lines covered

16 relevant lines. 14 lines covered and 2 lines missed.
    
  1. 1 require 'spec_helper'
  2. 1 ENV['RAILS_ENV'] ||= 'test'
  3. 1 require_relative '../config/environment'
  4. 1 abort('The Rails environment is running in production mode!') if Rails.env.production?
  5. 1 require 'rspec/rails'
  6. 1 require 'shoulda-matchers'
  7. 1 require_relative 'support/configs/shoulda_matcher'
  8. 1 require_relative 'support/configs/capybara'
  9. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> aca90e3 (Rebased) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 83979de (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased)
  10. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  11. 3 =======
  12. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======
  13. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) =======
  14. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======
  15. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
  16. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  17. 3 >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) =======
  18. 3 >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
  19. >>>>>>> cde4834 (Manifest_cache true) =======
  20. 3 >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) let(:titles) { %w[Adam Zimbabwe] } ======= begin >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= begin >>>>>>> 752f0c0 (Featire specs) ======= begin >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= begin >>>>>>> 08edf50 (Featire specs) ======= begin >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:titles) { %w[Adam Zimbabwe] } >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= begin >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= begin >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= let(:titles) { %w[Adam Zimbabwe] } >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= begin >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= begin >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= begin >>>>>>> cde4834 (Manifest_cache true) ======= let(:titles) { %w[Adam Zimbabwe] } >>>>>>> 1577aeb (Rebased)
  21. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) let(:books_dates) do ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:books_dates) do >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= let(:books_dates) do >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ActiveRecord::Migration.maintain_test_schema! >>>>>>> cde4834 (Manifest_cache true) ======= let(:books_dates) do >>>>>>> 1577aeb (Rebased)
  22. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  23. 1 =======
  24. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======
  25. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) =======
  26. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) =======
  27. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
  28. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  29. 1 >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) =======
  30. 1 >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
  31. >>>>>>> cde4834 (Manifest_cache true) =======
  32. 1 >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= rescue ActiveRecord::PendingMigrationError => e >>>>>>> cde4834 (Manifest_cache true) ======= ['Thu, 25 Aug 2022 15:25:38.761014000 UTC +00:00', 'Thu, 25 Aug 2022 14:20:38.761014000 UTC +00:00'] >>>>>>> 1577aeb (Rebased)
  33. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  34. =======
  35. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  36. >>>>>>> 752f0c0 (Featire specs) =======
  37. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  38. >>>>>>> 08edf50 (Featire specs) =======
  39. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  40. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  41. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= =======
  42. >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) =======
  43. >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  44. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= =======
  45. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
  46. >>>>>>> cde4834 (Manifest_cache true) =======
  47. >>>>>>> 1577aeb (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) end ======= puts e.to_s.strip >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) ======= puts e.to_s.strip >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) ======= puts e.to_s.strip >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= end >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= puts e.to_s.strip >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= puts e.to_s.strip >>>>>>> cde4834 (Manifest_cache true) ======= end >>>>>>> 1577aeb (Rebased)
  48. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  49. ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) =======
  50. ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) =======
  51. ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> cde4834 (Manifest_cache true)
  52. exit 1
  53. end
  54. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  55. >>>>>>> ee78f39 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) =======
  56. >>>>>>> 836a973 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> cde4834 (Manifest_cache true) =======
  57. >>>>>>> 1577aeb (Rebased)
  58. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 1577aeb (Rebased)
  59. 1 describe 'all books sort' do
  60. 1 context 'when sort by title A to Z' do
  61. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased)
  62. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) let(:books) do ======= RSpec.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) ======= RSpec.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= let(:books) do >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= let(:books) do >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= RSpec.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= RSpec.configure do |config| >>>>>>> cde4834 (Manifest_cache true) ======= let(:books) do >>>>>>> 1577aeb (Rebased)
  63. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) create(:book, title: titles.first) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= create(:book, title: titles.first) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= create(:book, title: titles.first) >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= config.fixture_path = "#{::Rails.root}/spec/fixtures" >>>>>>> cde4834 (Manifest_cache true) ======= create(:book, title: titles.first) >>>>>>> 1577aeb (Rebased)
  64. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) create(:book, title: titles.second) ======= config.use_transactional_fixtures = true >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= create(:book, title: titles.second) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= create(:book, title: titles.second) >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= config.use_transactional_fixtures = true >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= config.use_transactional_fixtures = true >>>>>>> cde4834 (Manifest_cache true) ======= create(:book, title: titles.second) >>>>>>> 1577aeb (Rebased)
  65. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 1577aeb (Rebased)
  66. end
  67. 2 let(:result) { titles.second }
  68. 2 let(:test) { described_class.query({ sort: 'title DESC' }).first.title }
  69. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  70. >>>>>>> d0dc1f1 (Featire specs) =======
  71. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  72. >>>>>>> 4e81ea2 (Featire specs) =======
  73. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  74. >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= =======
  75. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= =======
  76. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
  77. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= =======
  78. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= =======
  79. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= =======
  80. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) =======
  81. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) include_examples 'sort test' ======= config.infer_spec_type_from_file_location! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= include_examples 'sort test' >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= include_examples 'sort test' >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= config.infer_spec_type_from_file_location! >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= config.infer_spec_type_from_file_location! >>>>>>> cde4834 (Manifest_cache true) ======= include_examples 'sort test' >>>>>>> 1577aeb (Rebased)
  82. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 1577aeb (Rebased)
  83. end
  84. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  85. >>>>>>> d0dc1f1 (Featire specs) =======
  86. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  87. >>>>>>> 4e81ea2 (Featire specs) =======
  88. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  89. >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= =======
  90. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= =======
  91. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
  92. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= =======
  93. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= =======
  94. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= =======
  95. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) =======
  96. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) context 'when sort title Z to A' do ======= config.filter_rails_from_backtrace! >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= context 'when sort title Z to A' do >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= context 'when sort title Z to A' do >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= config.filter_rails_from_backtrace! >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= config.filter_rails_from_backtrace! >>>>>>> cde4834 (Manifest_cache true) ======= context 'when sort title Z to A' do >>>>>>> 1577aeb (Rebased)
  97. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 1577aeb (Rebased)
  98. 1 let(:books) do
  99. 1 create(:book, title: titles.first)
  100. 1 create(:book, title: titles.second)
  101. end
  102. 2 let(:result) { titles.first }
  103. 2 let(:test) { described_class.query({ sort: 'title' }).first.title }
  104. 1 include_examples 'sort test'
  105. end
  106. 1 context 'when sort by price High to Low' do
  107. 1 let(:books) do
  108. 1 create(:book, price_cents: 75)
  109. 1 create(:book, price_cents: 23)
  110. end
  111. 2 let(:result) { 75 }
  112. 2 let(:test) { described_class.query({ sort: 'price_cents DESC' }).first.price_cents }
  113. 1 include_examples 'sort test'
  114. end
  115. 1 context 'when sort price Low to High' do
  116. 1 let(:books) do
  117. 1 create(:book, price_cents: 75)
  118. 1 create(:book, price_cents: 23)
  119. end
  120. 2 let(:result) { 23 }
  121. 2 let(:test) { described_class.query({ sort: 'price_cents' }).first.price_cents }
  122. 1 include_examples 'sort test'
  123. end
  124. 1 context 'when sort by Newest' do
  125. 1 let(:books) do
  126. 1 create(:book, created_at: books_dates.first)
  127. 1 create(:book, created_at: books_dates.second)
  128. end
  129. 2 let(:result) { books_dates.first }
  130. 2 let(:test) { described_class.query({ sort: 'created_at DESC' }).first.created_at }
  131. 1 include_examples 'sort test'
  132. end
  133. end
  134. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  135. >>>>>>> d0dc1f1 (Featire specs) =======
  136. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  137. >>>>>>> 4e81ea2 (Featire specs) =======
  138. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  139. >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= =======
  140. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= =======
  141. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= =======
  142. >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= =======
  143. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= =======
  144. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= =======
  145. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) =======
  146. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) end
<<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased)

spec/support/configs/capybara.rb

<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 100.0% ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) 36.84% ======= <<<<<<< HEAD 100.0% ======= 36.84% >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 100.0% >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= 100.0% >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= 36.84% >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= 100.0% >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= 36.84% >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= 100.0% >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) ======= ======= 36.84% >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= 100.0% >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= 100.0% >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= 36.84% >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= 100.0% >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 8874887 (Manifest_cache true) ======= ======= 36.84% >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= 100.0% >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> bebaea7 (Rebased) ======= 36.84% >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= 36.84% >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased) lines covered

19 relevant lines. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) 7 lines covered and 12 lines missed. ======= <<<<<<< HEAD 19 lines covered and 0 lines missed. ======= 7 lines covered and 12 lines missed. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= 19 lines covered and 0 lines missed. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= 19 lines covered and 0 lines missed. >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= 19 lines covered and 0 lines missed. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= 7 lines covered and 12 lines missed. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= 7 lines covered and 12 lines missed. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= 19 lines covered and 0 lines missed. >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> bebaea7 (Rebased) ======= 7 lines covered and 12 lines missed. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= 7 lines covered and 12 lines missed. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased)
    
    <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true)
  1. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs)
  2. 1 =======
  3. >>>>>>> 752f0c0 (Featire specs) =======
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 113da87 (Featire specs) >>>>>>> 4e81ea2 (Featire specs) =======
  5. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) =======
  6. 1 >>>>>>> c033601 (Rebased) ======= >>>>>>> 752f0c0 (Featire specs) =======
  7. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  8. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) =======
  9. 1 >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  10. 1 >>>>>>> c033601 (Rebased) ======= >>>>>>> 752f0c0 (Featire specs) =======
  11. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  12. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) =======
  13. 1 >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  14. 1 >>>>>>> c033601 (Rebased) ======= >>>>>>> 752f0c0 (Featire specs) =======
  15. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  16. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) =======
  17. 1 >>>>>>> bf554f4 (Rebased) =======
  18. 1 >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  19. 1 >>>>>>> c033601 (Rebased) ======= >>>>>>> 752f0c0 (Featire specs) =======
  20. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= =======
  21. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9c0d812 (Featire specs) =======
  22. 1 >>>>>>> bf554f4 (Rebased) Capybara.configure do |config| <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased)
  23. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  24. >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) 1 <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs)
  25. 1 =======
  26. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= =======
  27. >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased)
  28. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  29. >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) 1 <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs)
  30. 1 =======
  31. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= =======
  32. >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> 3dc272d (Featire specs) >>>>>>> 752f0c0 (Featire specs)
  33. =======
  34. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs)
  35. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  36. >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) 1 <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs)
  37. 1 =======
  38. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= =======
  39. >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD Capybara.configure do |config| ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 752f0c0 (Featire specs)
  40. =======
  41. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs)
  42. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  43. >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) 1 ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs)
  44. 1 =======
  45. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= =======
  46. >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) <<<<<<< HEAD config.asset_host = 'http://localhost:3000' ======= Capybara.configure do |config| <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs)
  47. =======
  48. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) Capybara.configure do |config| ======= >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> a038b16 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs)
  49. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) =======
  50. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  51. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= =======
  52. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) 1 config.asset_host = 'http://localhost:3000' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> e5752db (Featire specs)
  53. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  54. =======
  55. >>>>>>> bd8bda4 (Manifest_cache true) ======= ======= >>>>>>> e5752db (Featire specs)
  56. =======
  57. >>>>>>> bd8bda4 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs)
  58. =======
  59. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs)
  60. =======
  61. >>>>>>> 183b6c5 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs)
  62. =======
  63. >>>>>>> fd6db03 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  64. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  65. =======
  66. =======
  67. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  68. =======
  69. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  70. =======
  71. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  72. =======
  73. <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs)
  74. =======
  75. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs)
  76. =======
  77. >>>>>>> 183b6c5 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD config.server_port = 3001 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs)
  78. =======
  79. >>>>>>> fd6db03 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  80. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 7945032 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  81. =======
  82. =======
  83. <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  84. =======
  85. <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  86. =======
  87. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  88. =======
  89. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> a9bf83f (Featire specs) >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs)
  90. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  91. =======
  92. =======
  93. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  94. =======
  95. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD
  96. ======= >>>>>>> 5c33a07 (Featire specs)
  97. =======
  98. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  99. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  100. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs)
  101. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD
  102. =======
  103. ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  104. =======
  105. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  106. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  107. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs)
  108. <<<<<<< HEAD <<<<<<< HEAD
  109. =======
  110. =======
  111. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  112. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs)
  113. =======
  114. =======
  115. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  116. =======
  117. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  118. =======
  119. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  120. =======
  121. =======
  122. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  123. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) =======
  124. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) =======
  125. >>>>>>> fd6db03 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) ======= 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased)
  126. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) >>>>>>> c033601 (Rebased)
  127. ======= =======
  128. =======
  129. >>>>>>> c8cdb08 (Manifest_cache true) =======
  130. >>>>>>> 4a0e3b6 (Manifest_cache true) =======
  131. >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  132. >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= =======
  133. >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> e5752db (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 49e8a6c (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4552227 (Featire specs)
  134. <<<<<<< HEAD
  135. =======
  136. >>>>>>> aa7b40c (Manifest_cache true) =======
  137. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs)
  138. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  139. =======
  140. >>>>>>> b459807 (Manifest_cache true) =======
  141. >>>>>>> 2ba25f7 (Manifest_cache true) =======
  142. >>>>>>> e9f3851 (Manifest_cache true) =======
  143. >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 6fba6be (Featire specs)
  144. <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= =======
  145. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= =======
  146. >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 <<<<<<< HEAD ======= ======= >>>>>>> e5752db (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= config.server_port = 3001 >>>>>>> 49e8a6c (Rebased)
  147. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  148. =======
  149. >>>>>>> 904663c (Featire specs) =======
  150. >>>>>>> b459807 (Manifest_cache true) =======
  151. >>>>>>> 2ba25f7 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
  152. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
  153. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD
  154. =======
  155. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  156. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  157. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) >>>>>>> 3723aad (Featire specs) ======= =======
  158. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end
  159. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) ======= end >>>>>>> 08edf50 (Featire specs)
  160. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs)
  161. ======= >>>>>>> df37394 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  162. =======
  163. >>>>>>> 752f0c0 (Featire specs) =======
  164. >>>>>>> bd8bda4 (Manifest_cache true) =======
  165. >>>>>>> 4e81ea2 (Featire specs) =======
  166. >>>>>>> aa7b40c (Manifest_cache true) =======
  167. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  168. >>>>>>> c033601 (Rebased) 1 =======
  169. =======
  170. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
  171. =======
  172. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) ======= end ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) config.default_driver = :rack_test ======= <<<<<<< HEAD ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= config.default_driver = :rack_test >>>>>>> 4552227 (Featire specs) >>>>>>> 6fba6be (Featire specs)
  173. <<<<<<< HEAD
  174. =======
  175. >>>>>>> fd6db03 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  176. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  177. =======
  178. =======
  179. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  180. =======
  181. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  182. =======
  183. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  184. =======
  185. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  186. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  187. =======
  188. =======
  189. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  190. =======
  191. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  192. =======
  193. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs)
  194. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs)
  195. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD
  196. =======
  197. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  198. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  199. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  200. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= =======
  201. =======
  202. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  203. =======
  204. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  205. ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= =======
  206. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
  207. =======
  208. >>>>>>> fd6db03 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= =======
  209. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= config.javascript_driver = :headless_chrome >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs)
  210. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  211. =======
  212. =======
  213. >>>>>>> 2722d07 (Manifest_cache true) =======
  214. >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs)
  215. >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs)
  216. <<<<<<< HEAD
  217. =======
  218. >>>>>>> bd8bda4 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= ======= >>>>>>> 8f1bc14 (Fix) Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs)
  219. =======
  220. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs)
  221. =======
  222. >>>>>>> 183b6c5 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs)
  223. =======
  224. >>>>>>> fd6db03 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  225. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  226. =======
  227. =======
  228. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  229. =======
  230. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  231. =======
  232. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  233. =======
  234. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5be567f (Featire specs) config.default_driver = :rack_test ======= ======= >>>>>>> 2ee03d3 (Featire specs) config.javascript_driver = :headless_chrome >>>>>>> 0b43b18 (Manifest_cache true) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs)
  235. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs)
  236. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  237. =======
  238. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= =======
  239. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  240. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
  241. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  242. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= end >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs)
  243. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 94841b5 (Featire specs)
  244. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  245. =======
  246. >>>>>>> 752f0c0 (Featire specs) =======
  247. >>>>>>> bd8bda4 (Manifest_cache true) =======
  248. >>>>>>> 4e81ea2 (Featire specs) =======
  249. >>>>>>> aa7b40c (Manifest_cache true) =======
  250. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  251. >>>>>>> c033601 (Rebased) 1 =======
  252. =======
  253. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
  254. =======
  255. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) ======= end ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> 96aecde (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 3b03895 (Featire specs)
  256. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  257. =======
  258. =======
  259. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  260. =======
  261. <<<<<<< HEAD =======
  262. >>>>>>> 3b03895 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> af057e3 (Featire specs)
  263. 1 ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs)
  264. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  265. 1 ======= >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  266. ======= <<<<<<< HEAD
  267. ======= =======
  268. ======= ======= >>>>>>> 00f8b58 (Manifest_cache true)
  269. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  270. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) =======
  271. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  272. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> df37394 (Featire specs)
  273. =======
  274. =======
  275. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  276. ======= >>>>>>> 5c33a07 (Featire specs)
  277. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  278. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  279. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs)
  280. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD
  281. =======
  282. ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  283. 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  284. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  285. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
  286. <<<<<<< HEAD <<<<<<< HEAD
  287. =======
  288. =======
  289. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs)
  290. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  291. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= ======= ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs)
  292. =======
  293. 1 >>>>>>> d0dc1f1 (Featire specs) =======
  294. =======
  295. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  296. =======
  297. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  298. =======
  299. =======
  300. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs)
  301. <<<<<<< HEAD >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased)
  302. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  303. >>>>>>> bf554f4 (Rebased) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) >>>>>>> c033601 (Rebased)
  304. ======= =======
  305. =======
  306. >>>>>>> c8cdb08 (Manifest_cache true) =======
  307. >>>>>>> 4a0e3b6 (Manifest_cache true) 1 <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test
  308. 1 config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs)
  309. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true)
  310. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD
  311. =======
  312. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= =======
  313. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end
  314. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs)
  315. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true)
  316. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  317. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  318. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  319. >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs)
  320. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  321. =======
  322. >>>>>>> 752f0c0 (Featire specs) =======
  323. >>>>>>> bd8bda4 (Manifest_cache true) =======
  324. >>>>>>> 4e81ea2 (Featire specs) =======
  325. >>>>>>> aa7b40c (Manifest_cache true) =======
  326. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= =======
  327. >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) 1 ======= <<<<<<< HEAD
  328. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  329. 1 >>>>>>> 752f0c0 (Featire specs) =======
  330. >>>>>>> bd8bda4 (Manifest_cache true) =======
  331. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  332. >>>>>>> aa7b40c (Manifest_cache true) =======
  333. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= =======
  334. >>>>>>> 183b6c5 (Manifest_cache true) =======
  335. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  336. 1 >>>>>>> c033601 (Rebased) >>>>>>> d780a52 (Rebased) =======
  337. =======
  338. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= =======
  339. =======
  340. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) <<<<<<< HEAD <<<<<<< HEAD Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) ======= end
  341. <<<<<<< HEAD
  342. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  343. ======= <<<<<<< HEAD
  344. ======= =======
  345. ======= ======= >>>>>>> 00f8b58 (Manifest_cache true)
  346. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  347. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) =======
  348. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  349. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs)
  350. =======
  351. =======
  352. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  353. ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7c4ea7f (Fix)
  354. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  355. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  356. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  357. >>>>>>> bf554f4 (Rebased) ======= =======
  358. ======= =======
  359. 1 config.default_driver = :rack_test
  360. >>>>>>> b15044a (Manifest_cache true)
  361. >>>>>>> 96aecde (Manifest_cache true) =======
  362. >>>>>>> 2c640cf (Manifest_cache true) 1 config.javascript_driver = :headless_chrome <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs)
  363. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true)
  364. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs)
  365. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true)
  366. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  367. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  368. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  369. >>>>>>> bf554f4 (Rebased) 1 ======= <<<<<<< HEAD
  370. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  371. 1 >>>>>>> 752f0c0 (Featire specs) =======
  372. >>>>>>> bd8bda4 (Manifest_cache true) =======
  373. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  374. >>>>>>> aa7b40c (Manifest_cache true) =======
  375. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= =======
  376. >>>>>>> 183b6c5 (Manifest_cache true) =======
  377. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  378. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= =======
  379. =======
  380. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= =======
  381. =======
  382. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> af057e3 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) config.server_port = 3001 ======= config.default_driver = :rack_test >>>>>>> 394c6f3 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= config.default_max_wait_time = 5 ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs)
  383. <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0b43b18 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  384. =======
  385. =======
  386. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  387. =======
  388. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  389. ======= >>>>>>> 5c33a07 (Featire specs)
  390. =======
  391. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  392. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  393. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs)
  394. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD
  395. =======
  396. ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  397. =======
  398. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  399. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  400. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
  401. <<<<<<< HEAD <<<<<<< HEAD
  402. =======
  403. =======
  404. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  405. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs)
  406. =======
  407. =======
  408. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  409. =======
  410. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  411. =======
  412. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  413. =======
  414. =======
  415. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  416. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) =======
  417. =======
  418. >>>>>>> fd6db03 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased)
  419. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
  420. ======= =======
  421. =======
  422. >>>>>>> c8cdb08 (Manifest_cache true) =======
  423. >>>>>>> 4a0e3b6 (Manifest_cache true) =======
  424. >>>>>>> 24b58e6 (Manifest_cache true) =======
  425. >>>>>>> 00f8b58 (Manifest_cache true) 1 ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4552227 (Featire specs)
  426. <<<<<<< HEAD
  427. =======
  428. >>>>>>> aa7b40c (Manifest_cache true) =======
  429. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4552227 (Featire specs)
  430. <<<<<<< HEAD
  431. =======
  432. >>>>>>> 183b6c5 (Manifest_cache true) =======
  433. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4552227 (Featire specs)
  434. <<<<<<< HEAD
  435. =======
  436. >>>>>>> fd6db03 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  437. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  438. =======
  439. =======
  440. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  441. =======
  442. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  443. =======
  444. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  445. =======
  446. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  447. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  448. =======
  449. =======
  450. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  451. =======
  452. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  453. =======
  454. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs)
  455. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs)
  456. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD
  457. =======
  458. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  459. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  460. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  461. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= =======
  462. =======
  463. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  464. =======
  465. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  466. ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= =======
  467. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
  468. =======
  469. >>>>>>> fd6db03 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= =======
  470. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= config.javascript_driver = :headless_chrome >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs)
  471. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  472. =======
  473. =======
  474. >>>>>>> 2722d07 (Manifest_cache true) =======
  475. >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs)
  476. >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs)
  477. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  478. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) 1 config.asset_host = 'http://localhost:3000' <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4552227 (Featire specs)
  479. <<<<<<< HEAD <<<<<<< HEAD
  480. ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 1577aeb (Rebased) =======
  481. >>>>>>> bd8bda4 (Manifest_cache true) =======
  482. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4552227 (Featire specs)
  483. <<<<<<< HEAD
  484. =======
  485. >>>>>>> aa7b40c (Manifest_cache true) =======
  486. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4552227 (Featire specs)
  487. <<<<<<< HEAD
  488. =======
  489. >>>>>>> 183b6c5 (Manifest_cache true) =======
  490. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' ======= ======= >>>>>>> 3dc272d (Featire specs) >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= config.default_driver = :rack_test >>>>>>> 4552227 (Featire specs)
  491. <<<<<<< HEAD
  492. =======
  493. >>>>>>> fd6db03 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  494. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  495. =======
  496. =======
  497. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  498. =======
  499. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  500. =======
  501. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  502. =======
  503. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) config.server_port = 3001 ======= ======= >>>>>>> a2de409 (Featire specs) config.default_driver = :rack_test >>>>>>> b5f64c6 (Manifest_cache true) ======= config.javascript_driver = :headless_chrome >>>>>>> 8c7bad7 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs)
  504. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  505. =======
  506. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= =======
  507. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  508. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
  509. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  510. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= end >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> b5f64c6 (Manifest_cache true)
  511. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 94841b5 (Featire specs)
  512. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  513. =======
  514. >>>>>>> 752f0c0 (Featire specs) =======
  515. >>>>>>> bd8bda4 (Manifest_cache true) =======
  516. >>>>>>> 4e81ea2 (Featire specs) =======
  517. >>>>>>> aa7b40c (Manifest_cache true) =======
  518. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  519. >>>>>>> c033601 (Rebased) 1 =======
  520. =======
  521. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
  522. =======
  523. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) ======= end ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> 96aecde (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 3b03895 (Featire specs)
  524. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true)
  525. =======
  526. =======
  527. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  528. =======
  529. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  530. >>>>>>> 3b03895 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54ceb0 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  531. <<<<<<< HEAD
  532. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  533. ======= <<<<<<< HEAD
  534. ======= =======
  535. ======= ======= >>>>>>> 00f8b58 (Manifest_cache true)
  536. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  537. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) =======
  538. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  539. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs)
  540. =======
  541. =======
  542. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  543. ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7c4ea7f (Fix)
  544. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  545. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  546. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  547. >>>>>>> bf554f4 (Rebased) ======= =======
  548. ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 8c7bad7 (Manifest_cache true) =======
  549. =======
  550. <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs)
  551. <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true)
  552. >>>>>>> 96aecde (Manifest_cache true) =======
  553. >>>>>>> 2c640cf (Manifest_cache true) =======
  554. >>>>>>> 866aee4 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs)
  555. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true)
  556. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs)
  557. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true)
  558. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  559. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  560. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  561. >>>>>>> bf554f4 (Rebased) 1 ======= <<<<<<< HEAD
  562. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  563. 1 >>>>>>> 752f0c0 (Featire specs) =======
  564. >>>>>>> bd8bda4 (Manifest_cache true) =======
  565. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  566. >>>>>>> aa7b40c (Manifest_cache true) =======
  567. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= =======
  568. >>>>>>> 183b6c5 (Manifest_cache true) =======
  569. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  570. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= =======
  571. =======
  572. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
  573. =======
  574. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) <<<<<<< HEAD <<<<<<< HEAD Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs)
  575. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  576. =======
  577. =======
  578. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  579. ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  580. ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  581. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) =======
  582. =======
  583. >>>>>>> fd6db03 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) =======
  584. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= config.javascript_driver = :headless_chrome >>>>>>> 4552227 (Featire specs)
  585. <<<<<<< HEAD
  586. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= ======= ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs)
  587. <<<<<<< HEAD
  588. =======
  589. >>>>>>> bd8bda4 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= ======= >>>>>>> 8f1bc14 (Fix) Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs)
  590. =======
  591. >>>>>>> aa7b40c (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs)
  592. =======
  593. >>>>>>> 183b6c5 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs)
  594. =======
  595. >>>>>>> fd6db03 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  596. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  597. =======
  598. =======
  599. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  600. =======
  601. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  602. =======
  603. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  604. =======
  605. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> 752f0c0 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> c033601 (Rebased) ======= config.default_max_wait_time = 5 ======= config.server_port = 3001 >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs)
  606. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  607. =======
  608. =======
  609. <<<<<<< HEAD ======= >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  610. =======
  611. >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) ======= <<<<<<< HEAD
  612. ======= >>>>>>> 5c33a07 (Featire specs)
  613. =======
  614. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  615. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  616. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.server_port = 3001 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> c8cdb08 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> a636fda (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> d2e6b3c (Featire specs)
  617. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD
  618. =======
  619. ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs)
  620. =======
  621. >>>>>>> b9cc4e9 (Manifest_cache true) 1 <<<<<<< HEAD ======= >>>>>>> 4e81ea2 (Featire specs) =======
  622. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  623. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 4e81ea2 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> c033601 (Rebased)
  624. <<<<<<< HEAD <<<<<<< HEAD
  625. =======
  626. =======
  627. >>>>>>> c033601 (Rebased) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) end ======= ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  628. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 3723aad (Featire specs)
  629. =======
  630. =======
  631. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  632. =======
  633. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  634. =======
  635. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  636. =======
  637. =======
  638. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  639. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) =======
  640. =======
  641. >>>>>>> fd6db03 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased)
  642. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c033601 (Rebased)
  643. ======= =======
  644. =======
  645. >>>>>>> c8cdb08 (Manifest_cache true) =======
  646. >>>>>>> 4a0e3b6 (Manifest_cache true) =======
  647. >>>>>>> 24b58e6 (Manifest_cache true) =======
  648. >>>>>>> 00f8b58 (Manifest_cache true) 1 ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4552227 (Featire specs)
  649. <<<<<<< HEAD
  650. =======
  651. >>>>>>> aa7b40c (Manifest_cache true) =======
  652. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4552227 (Featire specs)
  653. <<<<<<< HEAD
  654. =======
  655. >>>>>>> 183b6c5 (Manifest_cache true) =======
  656. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4552227 (Featire specs)
  657. <<<<<<< HEAD
  658. =======
  659. >>>>>>> fd6db03 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  660. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  661. =======
  662. =======
  663. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  664. =======
  665. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  666. =======
  667. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  668. =======
  669. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  670. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  671. =======
  672. =======
  673. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  674. =======
  675. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  676. =======
  677. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs)
  678. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs)
  679. >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD
  680. =======
  681. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  682. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  683. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  684. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= =======
  685. =======
  686. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  687. =======
  688. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  689. ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= =======
  690. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
  691. =======
  692. >>>>>>> fd6db03 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= =======
  693. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= end ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= ======= config.javascript_driver = :headless_chrome >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs)
  694. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  695. =======
  696. =======
  697. >>>>>>> 2722d07 (Manifest_cache true) =======
  698. >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs)
  699. >>>>>>> 2c640cf (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 65f3409 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs)
  700. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  701. >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) =======
  702. >>>>>>> 998f08d (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.asset_host = 'http://localhost:3000' <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4552227 (Featire specs)
  703. <<<<<<< HEAD <<<<<<< HEAD
  704. =======
  705. >>>>>>> bd8bda4 (Manifest_cache true) =======
  706. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD config.default_max_wait_time = 5 ======= config.asset_host = 'http://localhost:3000' >>>>>>> d0dc1f1 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4552227 (Featire specs)
  707. <<<<<<< HEAD
  708. =======
  709. >>>>>>> aa7b40c (Manifest_cache true) =======
  710. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.server_port = 3001 ======= config.default_max_wait_time = 5 >>>>>>> d0dc1f1 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 752f0c0 (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) Capybara.configure do |config| >>>>>>> 4e81ea2 (Featire specs) ======= config.server_port = 3001 >>>>>>> 4552227 (Featire specs)
  711. <<<<<<< HEAD
  712. =======
  713. >>>>>>> 183b6c5 (Manifest_cache true) =======
  714. >>>>>>> 4552227 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 4e81ea2 (Featire specs) ======= Capybara.configure do |config| >>>>>>> 08edf50 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 4552227 (Featire specs)
  715. <<<<<<< HEAD
  716. =======
  717. >>>>>>> fd6db03 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  718. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  719. =======
  720. =======
  721. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  722. =======
  723. >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  724. =======
  725. >>>>>>> aa7b40c (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  726. =======
  727. <<<<<<< HEAD 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 08edf50 (Featire specs) ======= ======= >>>>>>> 864f339 (Featire specs) config.server_port = 3001 ======= ======= >>>>>>> a2de409 (Featire specs) config.default_driver = :rack_test >>>>>>> b5f64c6 (Manifest_cache true) ======= config.javascript_driver = :headless_chrome >>>>>>> 8c7bad7 (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 864f339 (Featire specs) ======= ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs)
  728. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  729. =======
  730. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= =======
  731. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  732. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= =======
  733. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  734. >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= end >>>>>>> d0dc1f1 (Featire specs) ======= end >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= end >>>>>>> 08edf50 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= end >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= end >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) ======= config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> b5f64c6 (Manifest_cache true)
  735. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 94841b5 (Featire specs)
  736. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  737. =======
  738. >>>>>>> 752f0c0 (Featire specs) =======
  739. >>>>>>> bd8bda4 (Manifest_cache true) =======
  740. >>>>>>> 4e81ea2 (Featire specs) =======
  741. >>>>>>> aa7b40c (Manifest_cache true) =======
  742. >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) =======
  743. >>>>>>> c033601 (Rebased) 1 =======
  744. =======
  745. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) =======
  746. =======
  747. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) ======= end ======= <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) config.default_driver = :rack_test ======= config.javascript_driver = :headless_chrome >>>>>>> 96aecde (Manifest_cache true) ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test >>>>>>> 3b03895 (Featire specs)
  748. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true)
  749. =======
  750. =======
  751. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  752. =======
  753. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  754. >>>>>>> 3b03895 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54ceb0 (Featire specs) config.javascript_driver = :headless_chrome ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 4e81ea2 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 08edf50 (Featire specs)
  755. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  756. ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs)
  757. ======= =======
  758. ======= ======= >>>>>>> 00f8b58 (Manifest_cache true)
  759. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  760. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) =======
  761. >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  762. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs)
  763. =======
  764. =======
  765. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  766. ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 7c4ea7f (Fix)
  767. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  768. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  769. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  770. >>>>>>> bf554f4 (Rebased) ======= =======
  771. ======= ======= >>>>>>> bd8bda4 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 8c7bad7 (Manifest_cache true) =======
  772. =======
  773. <<<<<<< HEAD >>>>>>> 866aee4 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> d0dc1f1 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 752f0c0 (Featire specs)
  774. <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true)
  775. >>>>>>> 96aecde (Manifest_cache true) =======
  776. >>>>>>> 2c640cf (Manifest_cache true) =======
  777. >>>>>>> 866aee4 (Manifest_cache true) 1 <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs)
  778. <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true)
  779. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD ======= end >>>>>>> d0dc1f1 (Featire specs)
  780. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true)
  781. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  782. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  783. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  784. >>>>>>> bf554f4 (Rebased) 1 ======= <<<<<<< HEAD
  785. <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  786. 1 >>>>>>> 752f0c0 (Featire specs) =======
  787. >>>>>>> bd8bda4 (Manifest_cache true) =======
  788. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  789. >>>>>>> aa7b40c (Manifest_cache true) =======
  790. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
  791. >>>>>>> 183b6c5 (Manifest_cache true) =======
  792. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  793. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= =======
  794. =======
  795. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= =======
  796. =======
  797. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) <<<<<<< HEAD <<<<<<< HEAD Capybara.register_driver :headless_chrome do |app| ======= >>>>>>> d0dc1f1 (Featire specs) ======= end ======= config.javascript_driver = :headless_chrome >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= config.default_driver = :rack_test >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 9dc109d (Featire specs) ======= ======= config.server_port = 3001 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs)
  798. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  799. =======
  800. =======
  801. >>>>>>> 02a399d (Manifest_cache true) 1 >>>>>>> d0dc1f1 (Featire specs) =======
  802. ======= >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) 1 >>>>>>> 752f0c0 (Featire specs) =======
  803. ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) 1 >>>>>>> 4e81ea2 (Featire specs) =======
  804. ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) 1 >>>>>>> 08edf50 (Featire specs) =======
  805. =======
  806. >>>>>>> fd6db03 (Manifest_cache true) 1 >>>>>>> 7a02bbe (Featire specs) =======
  807. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD end ======= config.javascript_driver = :headless_chrome >>>>>>> d0dc1f1 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 4e81ea2 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 08edf50 (Featire specs) ======= config.asset_host = 'http://localhost:3000' >>>>>>> 7a02bbe (Featire specs) ======= config.javascript_driver = :headless_chrome >>>>>>> 4552227 (Featire specs)
  808. <<<<<<< HEAD
  809. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD config.javascript_driver = :headless_chrome >>>>>>> 752f0c0 (Featire specs) ======= config.default_driver = :rack_test ======= config.server_port = 3001 >>>>>>> 08edf50 (Featire specs) ======= config.default_max_wait_time = 5 >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= Capybara.configure do |config| >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 65f3409 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) ======= ======= Capybara.configure do |config| >>>>>>> d3d58e0 (Featire specs)
  810. 1 config.asset_host = 'http://localhost:3000'
  811. 1 config.default_max_wait_time = 5
  812. 1 config.server_port = 3001
  813. 1 config.default_driver = :rack_test
  814. 1 config.javascript_driver = :headless_chrome
  815. end
  816. 1 Capybara.register_driver :headless_chrome do |app|
  817. 1 client = Selenium::WebDriver::Remote::Http::Default.new
  818. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  819. 1 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  820. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price)
  821. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
  822. 1 =======
  823. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= =======
  824. 1 >>>>>>> 752f0c0 (Featire specs) =======
  825. >>>>>>> bd8bda4 (Manifest_cache true) =======
  826. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  827. >>>>>>> aa7b40c (Manifest_cache true) =======
  828. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  829. >>>>>>> 183b6c5 (Manifest_cache true) =======
  830. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======
  831. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) =======
  832. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  833. ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  834. >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  835. >>>>>>> ee5935f (Manifest_cache true) =======
  836. >>>>>>> 1c3ace6 (Manifest_cache true) =======
  837. >>>>>>> 4e7b845 (Manifest_cache true) ======= =======
  838. >>>>>>> 0c9131d (Manifest_cache true) =======
  839. >>>>>>> 1c3ace6 (Manifest_cache true) =======
  840. >>>>>>> 4e7b845 (Manifest_cache true) =======
  841. >>>>>>> b8aab1a (Manifest_cache true) ======= <<<<<<< HEAD
  842. 1 =======
  843. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  844. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
  845. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  846. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
  847. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  848. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  849. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  850. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  851. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) =======
  852. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  853. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) =======
  854. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) =======
  855. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= =======
  856. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  857. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) =======
  858. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  859. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  860. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  861. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) =======
  862. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  863. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) =======
  864. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  865. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) =======
  866. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) =======
  867. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  868. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) =======
  869. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======
  870. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  871. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= =======
  872. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= =======
  873. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  874. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 9d9ff14 (Manifest_cache true) =======
  875. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) =======
  876. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1a9aba9 (Fix) =======
  877. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= =======
  878. >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= =======
  879. 1 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  880. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  881. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) =======
  882. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  883. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) =======
  884. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) =======
  885. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) =======
  886. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) =======
  887. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  888. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
  889. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  890. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  891. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  892. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= =======
  893. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= =======
  894. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= =======
  895. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= =======
  896. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) =======
  897. 1 >>>>>>> 7c4ea7f (Fix) =======
  898. >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= =======
  899. 1 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= =======
  900. >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= =======
  901. 1 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) client.read_timeout = 150
  902. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  903. 1 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  904. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price)
  905. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
  906. 1 =======
  907. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= =======
  908. 1 >>>>>>> 752f0c0 (Featire specs) =======
  909. >>>>>>> bd8bda4 (Manifest_cache true) =======
  910. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  911. >>>>>>> aa7b40c (Manifest_cache true) =======
  912. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  913. ======= >>>>>>> 5c33a07 (Featire specs) ======= =======
  914. >>>>>>> 183b6c5 (Manifest_cache true) =======
  915. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 183b6c5 (Manifest_cache true) =======
  916. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======
  917. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) =======
  918. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  919. ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  920. >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  921. >>>>>>> ee5935f (Manifest_cache true) =======
  922. >>>>>>> 1c3ace6 (Manifest_cache true) =======
  923. >>>>>>> 4e7b845 (Manifest_cache true) ======= =======
  924. >>>>>>> 0c9131d (Manifest_cache true) =======
  925. >>>>>>> 1c3ace6 (Manifest_cache true) =======
  926. >>>>>>> 4e7b845 (Manifest_cache true) =======
  927. >>>>>>> b8aab1a (Manifest_cache true) ======= <<<<<<< HEAD
  928. 1 =======
  929. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  930. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) =======
  931. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  932. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) =======
  933. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54deeb (Featire specs) =======
  934. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  935. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  936. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  937. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) =======
  938. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) =======
  939. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= =======
  940. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  941. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  942. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  943. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) =======
  944. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  945. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) =======
  946. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  947. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) =======
  948. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 23e9df9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) =======
  949. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======
  950. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  951. >>>>>>> bf554f4 (Rebased) =======
  952. 1 >>>>>>> a5d032d (Fix) =======
  953. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) =======
  954. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  955. 1 >>>>>>> 7c4ea7f (Fix) =======
  956. >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e3b70 (Fix) =======
  957. 1 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) =======
  958. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= =======
  959. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  960. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= =======
  961. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= =======
  962. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= =======
  963. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) =======
  964. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= =======
  965. >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= =======
  966. 1 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs)
  967. >>>>>>> 8c32a77 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  968. ======= <<<<<<< HEAD
  969. 1 =======
  970. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  971. 1 >>>>>>> 752f0c0 (Featire specs) =======
  972. >>>>>>> bd8bda4 (Manifest_cache true) =======
  973. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  974. >>>>>>> aa7b40c (Manifest_cache true) =======
  975. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  976. >>>>>>> 183b6c5 (Manifest_cache true) =======
  977. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  978. 1 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
  979. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  980. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= =======
  981. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs)
  982. >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs)
  983. ======= <<<<<<< HEAD
  984. 1 =======
  985. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  986. 1 >>>>>>> 752f0c0 (Featire specs) =======
  987. >>>>>>> bd8bda4 (Manifest_cache true) =======
  988. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  989. >>>>>>> aa7b40c (Manifest_cache true) =======
  990. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= =======
  991. >>>>>>> 183b6c5 (Manifest_cache true) =======
  992. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  993. 1 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
  994. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  995. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  996. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs)
  997. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs)
  998. ======= <<<<<<< HEAD
  999. 1 =======
  1000. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  1001. 1 >>>>>>> 752f0c0 (Featire specs) =======
  1002. >>>>>>> bd8bda4 (Manifest_cache true) =======
  1003. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  1004. >>>>>>> aa7b40c (Manifest_cache true) =======
  1005. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= =======
  1006. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1007. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 836a973 (Rebased) =======
  1008. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
  1009. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  1010. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  1011. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  1012. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= =======
  1013. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
  1014. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= =======
  1015. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= =======
  1016. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) =======
  1017. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1018. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  1019. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= =======
  1020. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= =======
  1021. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= =======
  1022. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1a9aba9 (Fix) =======
  1023. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1024. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  1025. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  1026. 1 >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 1a9aba9 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs)
  1027. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1028. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> 02ba384 (Manifest_cache true) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  1029. ======= <<<<<<< HEAD
  1030. 1 =======
  1031. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
  1032. 1 >>>>>>> 752f0c0 (Featire specs) =======
  1033. >>>>>>> bd8bda4 (Manifest_cache true) =======
  1034. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  1035. >>>>>>> aa7b40c (Manifest_cache true) =======
  1036. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= =======
  1037. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1038. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======
  1039. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
  1040. >>>>>>> caaaa41 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) =======
  1041. 1 >>>>>>> 83979de (Featire specs) =======
  1042. >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======
  1043. 1 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  1044. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= ======= =======
  1045. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  1046. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= =======
  1047. 1 <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> ed97c39 (Manifest_cache true) ======= =======
  1048. <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) options = ::Selenium::WebDriver::Chrome::Options.new >>>>>>> 5506bd0 (Featire specs)
  1049. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true)
  1050. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> a9bf83f (Featire specs) =======
  1051. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) =======
  1052. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  1053. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) =======
  1054. >>>>>>> d52ad35 (Rebased) =======
  1055. 1 >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) =======
  1056. 1 >>>>>>> 93bdda9 (Featire specs) =======
  1057. >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  1058. >>>>>>> 49e8a6c (Rebased) =======
  1059. 1 >>>>>>> 872e675 (Fix) =======
  1060. >>>>>>> e9f3851 (Manifest_cache true) ======= =======
  1061. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
  1062. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= =======
  1063. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
  1064. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= =======
  1065. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
  1066. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs)
  1067. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1068. 1 ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) =======
  1069. 1 >>>>>>> 2a25e4c (Featire specs) =======
  1070. >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  1071. ======= <<<<<<< HEAD
  1072. 1 =======
  1073. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true)
  1074. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= =======
  1075. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) =======
  1076. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) =======
  1077. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  1078. >>>>>>> 078304c (Rebased) =======
  1079. 1 >>>>>>> d15fe1d (Fix) =======
  1080. >>>>>>> dcf74e1 (Manifest_cache true) ======= =======
  1081. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= =======
  1082. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= =======
  1083. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= =======
  1084. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= =======
  1085. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= =======
  1086. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs)
  1087. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true)
  1088. =======
  1089. 1 >>>>>>> 08edf50 (Featire specs) =======
  1090. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 64d4167 (Featire specs) =======
  1091. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d9b13 (Manifest_cache true) =======
  1092. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fd74f (Featire specs) =======
  1093. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7f7abc (Manifest_cache true) =======
  1094. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs)
  1095. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1096. 1 =======
  1097. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) =======
  1098. 1 >>>>>>> 8c32a77 (Featire specs) =======
  1099. >>>>>>> 902b803 (Manifest_cache true) =======
  1100. ======= <<<<<<< HEAD
  1101. 1 =======
  1102. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= =======
  1103. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true)
  1104. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= =======
  1105. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) =======
  1106. >>>>>>> bebaea7 (Rebased) =======
  1107. 1 >>>>>>> eaef86a (Fix) =======
  1108. >>>>>>> 5518ff0 (Manifest_cache true) ======= =======
  1109. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs)
  1110. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true)
  1111. =======
  1112. 1 >>>>>>> 08edf50 (Featire specs) =======
  1113. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1114. 1 >>>>>>> 7a02bbe (Featire specs) =======
  1115. >>>>>>> fd6db03 (Manifest_cache true) =======
  1116. 1 >>>>>>> 4552227 (Featire specs) =======
  1117. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) options = ::Selenium::WebDriver::Chrome::Options.new ======= client.read_timeout = 150 >>>>>>> d0dc1f1 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 752f0c0 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 4e81ea2 (Featire specs) ======= client.read_timeout = 150 >>>>>>> 08edf50 (Featire specs)
  1118. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true)
  1119. =======
  1120. 1 >>>>>>> 08edf50 (Featire specs) =======
  1121. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1122. 1 >>>>>>> 7a02bbe (Featire specs) =======
  1123. >>>>>>> fd6db03 (Manifest_cache true) =======
  1124. 1 >>>>>>> 4552227 (Featire specs) =======
  1125. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) options = ::Selenium::WebDriver::Chrome::Options.new
  1126. 1 options.headless!
  1127. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) >>>>>>> 307ac6e (Manifest_cache true)
  1128. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1129. =======
  1130. >>>>>>> 752f0c0 (Featire specs) =======
  1131. >>>>>>> bd8bda4 (Manifest_cache true) =======
  1132. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) =======
  1133. >>>>>>> aa7b40c (Manifest_cache true) =======
  1134. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) =======
  1135. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) >>>>>>> d8298a1 (Manifest_cache true)
  1136. =======
  1137. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 6edce20 (Manifest_cache true) >>>>>>> a636fda (Featire specs) ======= =======
  1138. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  1139. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> d8298a1 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) ======= =======
  1140. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= =======
  1141. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= =======
  1142. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  1143. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= =======
  1144. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  1145. >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= =======
  1146. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true)
  1147. =======
  1148. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= =======
  1149. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= =======
  1150. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 027f794 (Manifest_cache true) ======= =======
  1151. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= =======
  1152. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d1bae53 (Manifest_cache true) ======= =======
  1153. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= =======
  1154. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= =======
  1155. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 13fd74f (Featire specs) ======= =======
  1156. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> f7f7abc (Manifest_cache true) ======= =======
  1157. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= =======
  1158. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= =======
  1159. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= =======
  1160. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
  1161. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> be2f578 (Manifest_cache true) ======= =======
  1162. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> ed97c39 (Manifest_cache true) ======= =======
  1163. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 20256f8 (Featire specs) ======= =======
  1164. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 587ce47 (Manifest_cache true) ======= =======
  1165. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= =======
  1166. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> b35d1f8 (Featire specs)
  1167. =======
  1168. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
  1169. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= =======
  1170. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
  1171. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= =======
  1172. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======
  1173. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= =======
  1174. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======
  1175. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= =======
  1176. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  1177. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= =======
  1178. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= =======
  1179. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= =======
  1180. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= =======
  1181. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= =======
  1182. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= =======
  1183. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= =======
  1184. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= =======
  1185. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= =======
  1186. >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= =======
  1187. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= =======
  1188. >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  1189. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= =======
  1190. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= =======
  1191. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  1192. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= =======
  1193. >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= =======
  1194. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= =======
  1195. =======
  1196. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= =======
  1197. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= =======
  1198. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= =======
  1199. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= =======
  1200. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= =======
  1201. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= =======
  1202. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= =======
  1203. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= =======
  1204. >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= =======
  1205. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= =======
  1206. >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= =======
  1207. =======
  1208. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= =======
  1209. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= =======
  1210. >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= =======
  1211. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= =======
  1212. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= =======
  1213. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= =======
  1214. >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= =======
  1215. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= =======
  1216. >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= =======
  1217. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= =======
  1218. >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  1219. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1220. 1 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  1221. ======= <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> c1749d5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> b00b319 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> 394c6f3 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= ======= >>>>>>> b763f5b (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 9dc109d (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) >>>>>>> 04108c4 (Manifest_cache true)
  1222. 1 =======
  1223. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  1224. 1 >>>>>>> 752f0c0 (Featire specs) =======
  1225. >>>>>>> bd8bda4 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true)
  1226. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  1227. >>>>>>> aa7b40c (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true)
  1228. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= =======
  1229. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1230. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= =======
  1231. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) =======
  1232. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= =======
  1233. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= =======
  1234. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  1235. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) =======
  1236. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======
  1237. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) =======
  1238. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) =======
  1239. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) =======
  1240. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= =======
  1241. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1242. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= =======
  1243. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) =======
  1244. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= =======
  1245. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= =======
  1246. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  1247. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) =======
  1248. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  1249. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 10bdfea (Manifest_cache true) =======
  1250. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> d70f030 (Manifest_cache true) =======
  1251. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  1252. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 0832698 (Manifest_cache true) =======
  1253. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  1254. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0b5b269 (Fix) =======
  1255. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) =======
  1256. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= =======
  1257. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1258. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  1259. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
  1260. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= =======
  1261. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= =======
  1262. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  1263. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
  1264. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1265. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bebaea7 (Rebased) =======
  1266. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> eaef86a (Fix) =======
  1267. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> e2bfd89 (Manifest_cache true) =======
  1268. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= =======
  1269. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= =======
  1270. 1 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  1271. >>>>>>> cde4834 (Manifest_cache true) =======
  1272. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= =======
  1273. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1274. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  1275. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= =======
  1276. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= =======
  1277. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= =======
  1278. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= =======
  1279. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= =======
  1280. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= =======
  1281. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= =======
  1282. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  1283. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 9d9ff14 (Manifest_cache true) =======
  1284. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) =======
  1285. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  1286. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= =======
  1287. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= =======
  1288. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= =======
  1289. 1 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= =======
  1290. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= =======
  1291. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= =======
  1292. 1 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) options.add_argument('--no-sandbox')
  1293. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1294. 1 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  1295. ======= <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> 6edce20 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0832698 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> dcf74e1 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 5518ff0 (Manifest_cache true) >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) >>>>>>> 04108c4 (Manifest_cache true)
  1296. 1 =======
  1297. >>>>>>> ae2a012 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  1298. 1 >>>>>>> 752f0c0 (Featire specs) =======
  1299. >>>>>>> bd8bda4 (Manifest_cache true) =======
  1300. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  1301. >>>>>>> aa7b40c (Manifest_cache true) =======
  1302. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  1303. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1304. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======
  1305. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  1306. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  1307. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  1308. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1309. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  1310. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
  1311. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1312. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) =======
  1313. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) =======
  1314. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  1315. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  1316. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= =======
  1317. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  1318. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  1319. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  1320. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  1321. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) =======
  1322. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  1323. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) =======
  1324. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======
  1325. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  1326. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= =======
  1327. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  1328. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 9d9ff14 (Manifest_cache true) =======
  1329. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) =======
  1330. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  1331. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= =======
  1332. 1 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  1333. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  1334. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  1335. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) =======
  1336. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) =======
  1337. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  1338. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) =======
  1339. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  1340. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  1341. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  1342. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  1343. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) =======
  1344. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  1345. 1 <<<<<<< HEAD >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  1346. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= =======
  1347. 1 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) options.add_argument('--disable-dev-shm-usage')
  1348. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 715fac2 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  1349. ======= <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs)
  1350. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
  1351. ======= <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price)
  1352. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true)
  1353. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  1354. 1 >>>>>>> 752f0c0 (Featire specs) =======
  1355. >>>>>>> bd8bda4 (Manifest_cache true) =======
  1356. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  1357. >>>>>>> aa7b40c (Manifest_cache true) =======
  1358. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  1359. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1360. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======
  1361. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) =======
  1362. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) =======
  1363. >>>>>>> 02a399d (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true)
  1364. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 3fef583 (Manifest_cache true)
  1365. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) =======
  1366. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true)
  1367. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= ======= >>>>>>> 93db8b1 (Featire specs) >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  1368. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= ======= >>>>>>> b746b60 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) =======
  1369. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> 5f76842 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  1370. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) >>>>>>> b832d45 (Featire specs) >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= ======= >>>>>>> e965665 (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) =======
  1371. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= ======= >>>>>>> ea0650c (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  1372. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 3723aad (Featire specs) >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= ======= >>>>>>> 10b6c72 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) =======
  1373. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) =======
  1374. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  1375. 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) =======
  1376. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======
  1377. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) =======
  1378. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) =======
  1379. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  1380. 1 >>>>>>> 715fac2 (Featire specs) >>>>>>> 752f0c0 (Featire specs) =======
  1381. >>>>>>> bd8bda4 (Manifest_cache true) =======
  1382. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  1383. >>>>>>> aa7b40c (Manifest_cache true) =======
  1384. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) =======
  1385. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  1386. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= =======
  1387. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  1388. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 0832698 (Manifest_cache true) =======
  1389. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  1390. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 0b5b269 (Fix) =======
  1391. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  1392. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
  1393. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  1394. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
  1395. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  1396. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  1397. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1398. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  1399. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
  1400. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1401. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> bebaea7 (Rebased) =======
  1402. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> eaef86a (Fix) =======
  1403. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) =======
  1404. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= =======
  1405. 1 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  1406. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  1407. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 9d9ff14 (Manifest_cache true) =======
  1408. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) =======
  1409. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  1410. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= =======
  1411. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= =======
  1412. 1 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= =======
  1413. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= =======
  1414. 1 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) options.add_argument('--window-size=1400,1400')
  1415. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1416. 1 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  1417. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price)
  1418. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
  1419. 1 =======
  1420. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= =======
  1421. 1 >>>>>>> 752f0c0 (Featire specs) =======
  1422. >>>>>>> bd8bda4 (Manifest_cache true) =======
  1423. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  1424. >>>>>>> aa7b40c (Manifest_cache true) =======
  1425. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  1426. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1427. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======
  1428. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) =======
  1429. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  1430. ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  1431. >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  1432. >>>>>>> ee5935f (Manifest_cache true) =======
  1433. >>>>>>> 1c3ace6 (Manifest_cache true) =======
  1434. >>>>>>> 4e7b845 (Manifest_cache true) ======= =======
  1435. >>>>>>> 0c9131d (Manifest_cache true) =======
  1436. >>>>>>> 1c3ace6 (Manifest_cache true) =======
  1437. >>>>>>> 4e7b845 (Manifest_cache true) =======
  1438. >>>>>>> b8aab1a (Manifest_cache true) ======= <<<<<<< HEAD
  1439. 1 =======
  1440. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  1441. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
  1442. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  1443. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
  1444. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  1445. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  1446. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1447. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  1448. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
  1449. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1450. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) =======
  1451. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) =======
  1452. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= =======
  1453. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  1454. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  1455. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= =======
  1456. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  1457. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  1458. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) =======
  1459. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  1460. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) =======
  1461. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  1462. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) =======
  1463. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) =======
  1464. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  1465. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) =======
  1466. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======
  1467. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  1468. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= =======
  1469. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= =======
  1470. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  1471. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 9d9ff14 (Manifest_cache true) =======
  1472. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) =======
  1473. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  1474. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= =======
  1475. >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= =======
  1476. 1 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  1477. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  1478. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) =======
  1479. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  1480. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) =======
  1481. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) =======
  1482. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) =======
  1483. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) =======
  1484. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  1485. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) =======
  1486. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  1487. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  1488. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  1489. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= =======
  1490. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  1491. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) =======
  1492. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  1493. 1 <<<<<<< HEAD >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  1494. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= =======
  1495. >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= =======
  1496. >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= =======
  1497. 1 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) options.add_argument('--allow-insecure-localhost')
  1498. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1499. 1 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  1500. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price)
  1501. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
  1502. 1 =======
  1503. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= =======
  1504. 1 >>>>>>> 752f0c0 (Featire specs) =======
  1505. >>>>>>> bd8bda4 (Manifest_cache true) =======
  1506. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  1507. >>>>>>> aa7b40c (Manifest_cache true) =======
  1508. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  1509. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1510. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======
  1511. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) =======
  1512. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  1513. ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  1514. >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  1515. >>>>>>> ee5935f (Manifest_cache true) =======
  1516. >>>>>>> 1c3ace6 (Manifest_cache true) =======
  1517. >>>>>>> 4e7b845 (Manifest_cache true) ======= =======
  1518. >>>>>>> 0c9131d (Manifest_cache true) =======
  1519. >>>>>>> 1c3ace6 (Manifest_cache true) =======
  1520. >>>>>>> 4e7b845 (Manifest_cache true) =======
  1521. >>>>>>> b8aab1a (Manifest_cache true) ======= <<<<<<< HEAD
  1522. 1 =======
  1523. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  1524. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) =======
  1525. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) =======
  1526. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) =======
  1527. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) =======
  1528. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  1529. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1530. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 3b03895 (Featire specs) =======
  1531. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
  1532. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1533. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) =======
  1534. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) =======
  1535. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= =======
  1536. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  1537. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  1538. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= =======
  1539. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  1540. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  1541. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) =======
  1542. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  1543. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) =======
  1544. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  1545. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) =======
  1546. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) =======
  1547. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  1548. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) =======
  1549. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======
  1550. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  1551. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= =======
  1552. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= =======
  1553. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) =======
  1554. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 9d9ff14 (Manifest_cache true) =======
  1555. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) =======
  1556. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  1557. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= =======
  1558. >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= =======
  1559. 1 >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  1560. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  1561. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) =======
  1562. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) =======
  1563. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) =======
  1564. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) =======
  1565. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) =======
  1566. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) =======
  1567. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) =======
  1568. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) =======
  1569. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  1570. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  1571. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  1572. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= =======
  1573. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  1574. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) =======
  1575. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) =======
  1576. 1 <<<<<<< HEAD >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  1577. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= =======
  1578. >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= =======
  1579. >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= =======
  1580. 1 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess')
  1581. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1582. 1 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  1583. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) >>>>>>> cea736b (Fix book_spec decrease quantity and price)
  1584. >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD
  1585. 1 =======
  1586. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= =======
  1587. 1 >>>>>>> 752f0c0 (Featire specs) =======
  1588. >>>>>>> bd8bda4 (Manifest_cache true) =======
  1589. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  1590. >>>>>>> aa7b40c (Manifest_cache true) =======
  1591. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= =======
  1592. ======= >>>>>>> 5c33a07 (Featire specs) ======= =======
  1593. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1594. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 183b6c5 (Manifest_cache true) =======
  1595. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======
  1596. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) =======
  1597. >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  1598. ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  1599. >>>>>>> 1c3ace6 (Manifest_cache true) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price)
  1600. >>>>>>> ee5935f (Manifest_cache true) =======
  1601. >>>>>>> 1c3ace6 (Manifest_cache true) =======
  1602. >>>>>>> 4e7b845 (Manifest_cache true) ======= =======
  1603. >>>>>>> 0c9131d (Manifest_cache true) =======
  1604. >>>>>>> 1c3ace6 (Manifest_cache true) =======
  1605. >>>>>>> 4e7b845 (Manifest_cache true) =======
  1606. >>>>>>> b8aab1a (Manifest_cache true) ======= <<<<<<< HEAD
  1607. 1 =======
  1608. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  1609. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) =======
  1610. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) =======
  1611. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) =======
  1612. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54deeb (Featire specs) =======
  1613. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  1614. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) =======
  1615. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1616. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) =======
  1617. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) =======
  1618. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= =======
  1619. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  1620. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  1621. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  1622. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) =======
  1623. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  1624. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) =======
  1625. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  1626. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) =======
  1627. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 23e9df9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) =======
  1628. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) =======
  1629. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) =======
  1630. >>>>>>> bf554f4 (Rebased) =======
  1631. 1 >>>>>>> a5d032d (Fix) =======
  1632. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1c3ace6 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) =======
  1633. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) =======
  1634. 1 >>>>>>> 7c4ea7f (Fix) =======
  1635. >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e3b70 (Fix) =======
  1636. 1 >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) =======
  1637. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) ======= =======
  1638. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  1639. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= =======
  1640. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= =======
  1641. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= =======
  1642. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) =======
  1643. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 4e7b845 (Manifest_cache true) >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= =======
  1644. >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= =======
  1645. 1 >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs)
  1646. >>>>>>> 8c32a77 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price)
  1647. ======= <<<<<<< HEAD
  1648. 1 =======
  1649. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  1650. 1 >>>>>>> 752f0c0 (Featire specs) =======
  1651. >>>>>>> bd8bda4 (Manifest_cache true) =======
  1652. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  1653. >>>>>>> aa7b40c (Manifest_cache true) =======
  1654. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= =======
  1655. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1656. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) =======
  1657. 1 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
  1658. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  1659. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= =======
  1660. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs)
  1661. >>>>>>> 2a25e4c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD ======= ======= <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs)
  1662. ======= <<<<<<< HEAD
  1663. 1 =======
  1664. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  1665. 1 >>>>>>> 752f0c0 (Featire specs) =======
  1666. >>>>>>> bd8bda4 (Manifest_cache true) =======
  1667. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  1668. >>>>>>> aa7b40c (Manifest_cache true) =======
  1669. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= =======
  1670. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1671. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD =======
  1672. 1 >>>>>>> c033601 (Rebased) ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
  1673. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  1674. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> 3723aad (Featire specs) ======= ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  1675. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs)
  1676. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs)
  1677. ======= <<<<<<< HEAD
  1678. 1 =======
  1679. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= =======
  1680. 1 >>>>>>> 752f0c0 (Featire specs) =======
  1681. >>>>>>> bd8bda4 (Manifest_cache true) =======
  1682. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  1683. >>>>>>> aa7b40c (Manifest_cache true) =======
  1684. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= =======
  1685. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1686. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 836a973 (Rebased) =======
  1687. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
  1688. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  1689. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  1690. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  1691. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= =======
  1692. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
  1693. <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= ======= =======
  1694. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= ======= =======
  1695. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) =======
  1696. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1697. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  1698. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= =======
  1699. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= =======
  1700. >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= =======
  1701. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 1a9aba9 (Fix) =======
  1702. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= =======
  1703. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  1704. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  1705. 1 >>>>>>> a5d032d (Fix) >>>>>>> eaef86a (Fix) ======= >>>>>>> 1a9aba9 (Fix) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs)
  1706. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1707. 1 ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= >>>>>>> 02ba384 (Manifest_cache true) ======= >>>>>>> fd3e35e (Featire specs) ======= >>>>>>> 926dfe5 (Manifest_cache true) ======= >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= >>>>>>> 1677b1a (Featire specs) ======= >>>>>>> 1830ff1 (Manifest_cache true) ======= >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price)
  1708. ======= <<<<<<< HEAD
  1709. 1 =======
  1710. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= =======
  1711. 1 >>>>>>> 752f0c0 (Featire specs) =======
  1712. >>>>>>> bd8bda4 (Manifest_cache true) =======
  1713. 1 >>>>>>> 4e81ea2 (Featire specs) =======
  1714. >>>>>>> aa7b40c (Manifest_cache true) =======
  1715. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= =======
  1716. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1717. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 1577aeb (Rebased) =======
  1718. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD ======= ======= ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true)
  1719. >>>>>>> caaaa41 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d780a52 (Rebased) =======
  1720. 1 >>>>>>> 83979de (Featire specs) =======
  1721. >>>>>>> d0f5c14 (Manifest_cache true) ======= >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) =======
  1722. 1 <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  1723. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD ======= ======= =======
  1724. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  1725. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= =======
  1726. 1 <<<<<<< HEAD >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) >>>>>>> ed97c39 (Manifest_cache true) ======= =======
  1727. <<<<<<< HEAD >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> ee5242b (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) options.add_argument('--ignore-certificate-errors=true') >>>>>>> 5506bd0 (Featire specs)
  1728. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true)
  1729. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> a9bf83f (Featire specs) =======
  1730. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) =======
  1731. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  1732. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) =======
  1733. >>>>>>> d52ad35 (Rebased) =======
  1734. 1 >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) =======
  1735. 1 >>>>>>> 93bdda9 (Featire specs) =======
  1736. >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) =======
  1737. >>>>>>> 49e8a6c (Rebased) =======
  1738. 1 >>>>>>> 872e675 (Fix) =======
  1739. >>>>>>> e9f3851 (Manifest_cache true) ======= =======
  1740. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
  1741. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= =======
  1742. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
  1743. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= =======
  1744. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
  1745. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs)
  1746. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1747. 1 ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> 836a973 (Rebased) =======
  1748. 1 >>>>>>> 2a25e4c (Featire specs) =======
  1749. >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price)
  1750. ======= <<<<<<< HEAD
  1751. 1 =======
  1752. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= ======= ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true)
  1753. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= =======
  1754. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) =======
  1755. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) =======
  1756. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) =======
  1757. >>>>>>> 078304c (Rebased) =======
  1758. 1 >>>>>>> d15fe1d (Fix) =======
  1759. >>>>>>> dcf74e1 (Manifest_cache true) ======= =======
  1760. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= =======
  1761. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= =======
  1762. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= =======
  1763. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= =======
  1764. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= =======
  1765. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs)
  1766. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> aa7b40c (Manifest_cache true)
  1767. =======
  1768. 1 >>>>>>> 08edf50 (Featire specs) =======
  1769. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 64d4167 (Featire specs) =======
  1770. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d9b13 (Manifest_cache true) =======
  1771. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fd74f (Featire specs) =======
  1772. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> f7f7abc (Manifest_cache true) =======
  1773. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> b35d1f8 (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs)
  1774. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1775. 1 =======
  1776. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= >>>>>>> 1577aeb (Rebased) =======
  1777. 1 >>>>>>> 8c32a77 (Featire specs) =======
  1778. >>>>>>> 902b803 (Manifest_cache true) =======
  1779. ======= <<<<<<< HEAD
  1780. 1 =======
  1781. >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= =======
  1782. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true)
  1783. <<<<<<< HEAD >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= =======
  1784. 1 >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) =======
  1785. >>>>>>> bebaea7 (Rebased) =======
  1786. 1 >>>>>>> eaef86a (Fix) =======
  1787. >>>>>>> 5518ff0 (Manifest_cache true) ======= =======
  1788. 1 >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs)
  1789. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true)
  1790. =======
  1791. 1 >>>>>>> 08edf50 (Featire specs) =======
  1792. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1793. 1 >>>>>>> 7a02bbe (Featire specs) =======
  1794. >>>>>>> fd6db03 (Manifest_cache true) =======
  1795. 1 >>>>>>> 4552227 (Featire specs) =======
  1796. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) options.add_argument('--ignore-certificate-errors=true') ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> d0dc1f1 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 752f0c0 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 4e81ea2 (Featire specs) ======= options.add_argument('--enable-features=NetworkService,NetworkServiceInProcess') >>>>>>> 08edf50 (Featire specs)
  1797. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> aa7b40c (Manifest_cache true)
  1798. =======
  1799. 1 >>>>>>> 08edf50 (Featire specs) =======
  1800. >>>>>>> 183b6c5 (Manifest_cache true) =======
  1801. 1 >>>>>>> 7a02bbe (Featire specs) =======
  1802. >>>>>>> fd6db03 (Manifest_cache true) =======
  1803. 1 >>>>>>> 4552227 (Featire specs) =======
  1804. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) ======= >>>>>>> 4552227 (Featire specs) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) options.add_argument('--ignore-certificate-errors=true')
  1805. 1 options.add_argument('--accept-insecure-certs=true')
  1806. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) >>>>>>> 307ac6e (Manifest_cache true)
  1807. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  1808. =======
  1809. >>>>>>> 752f0c0 (Featire specs) =======
  1810. >>>>>>> bd8bda4 (Manifest_cache true) =======
  1811. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) =======
  1812. >>>>>>> aa7b40c (Manifest_cache true) =======
  1813. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) =======
  1814. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) >>>>>>> d8298a1 (Manifest_cache true)
  1815. =======
  1816. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 6edce20 (Manifest_cache true) >>>>>>> a636fda (Featire specs) ======= =======
  1817. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  1818. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> d8298a1 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) ======= =======
  1819. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= =======
  1820. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= =======
  1821. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  1822. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= =======
  1823. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  1824. >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= =======
  1825. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true)
  1826. =======
  1827. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= =======
  1828. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= =======
  1829. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 027f794 (Manifest_cache true) ======= =======
  1830. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= =======
  1831. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d1bae53 (Manifest_cache true) ======= =======
  1832. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= =======
  1833. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= =======
  1834. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 13fd74f (Featire specs) ======= =======
  1835. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> f7f7abc (Manifest_cache true) ======= =======
  1836. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= =======
  1837. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= =======
  1838. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= =======
  1839. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
  1840. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> be2f578 (Manifest_cache true) ======= =======
  1841. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> ed97c39 (Manifest_cache true) ======= =======
  1842. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 20256f8 (Featire specs) ======= =======
  1843. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 587ce47 (Manifest_cache true) ======= =======
  1844. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= =======
  1845. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= ======= >>>>>>> b35d1f8 (Featire specs)
  1846. =======
  1847. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
  1848. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= =======
  1849. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
  1850. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= =======
  1851. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======
  1852. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= =======
  1853. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======
  1854. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= =======
  1855. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  1856. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= =======
  1857. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= =======
  1858. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= =======
  1859. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= =======
  1860. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= =======
  1861. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= =======
  1862. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= =======
  1863. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= =======
  1864. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= =======
  1865. >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= =======
  1866. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= =======
  1867. >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  1868. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= =======
  1869. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= =======
  1870. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  1871. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= =======
  1872. >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= =======
  1873. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= =======
  1874. =======
  1875. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= =======
  1876. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= =======
  1877. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= =======
  1878. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= =======
  1879. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= =======
  1880. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= =======
  1881. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= =======
  1882. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= =======
  1883. >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= =======
  1884. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= =======
  1885. >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= =======
  1886. =======
  1887. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= =======
  1888. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= =======
  1889. >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= =======
  1890. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= =======
  1891. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= =======
  1892. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= =======
  1893. >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= =======
  1894. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= =======
  1895. >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= =======
  1896. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= =======
  1897. >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  1898. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> ee5935f (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> d15fe1d (Fix) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> d66884b (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> eaef86a (Fix) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 3dc272d (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> d59dfbb (Fix book_spec decrease quantity and price)
  1899. ======= >>>>>>> 715fac2 (Featire specs) <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 864f339 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> c1749d5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= >>>>>>> ebe5361 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> a455e8a (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= >>>>>>> d3d58e0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) ======= >>>>>>> cea736b (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 866aee4 (Manifest_cache true) ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= ======= >>>>>>> b763f5b (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) >>>>>>> 04108c4 (Manifest_cache true)
  1900. =======
  1901. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD 1 ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 7945032 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 0bdcc5e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 563720e (Featire specs) ======= <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2ba25f7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 49e8a6c (Rebased) ======= <<<<<<< HEAD >>>>>>> 872e675 (Fix) ======= <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) >>>>>>> 5c33a07 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 82f97ce (Fix book_spec decrease quantity and price)
  1902. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) ======= >>>>>>> bc08537 (Fix book_spec decrease quantity and price) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 93bdda9 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> b00b319 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= ======= >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) >>>>>>> 307f31f (Manifest_cache true)
  1903. =======
  1904. >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 8c32a77 (Featire specs) 1 =======
  1905. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> 307f31f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 0c9131d (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 75be480 (Manifest_cache true) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 3fef583 (Manifest_cache true) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> 04108c4 (Manifest_cache true) >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD ======= =======
  1906. 1 >>>>>>> 752f0c0 (Featire specs) =======
  1907. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 1cb2e82 (Featire specs) =======
  1908. 1 >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> fe7e312 (Manifest_cache true) =======
  1909. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 8577deb (Featire specs) =======
  1910. 1 >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> d96cf3b (Featire specs) ======= ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 94d9078 (Manifest_cache true) =======
  1911. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) =======
  1912. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= <<<<<<< HEAD ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  1913. =======
  1914. >>>>>>> d0dc1f1 (Featire specs) 1 <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f764a87 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 9dc109d (Featire specs)
  1915. =======
  1916. >>>>>>> d0dc1f1 (Featire specs) 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d780a52 (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0f5c14 (Manifest_cache true) ======= ======= >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> cfd1f7f (Manifest_cache true) ======= ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> c1749d5 (Featire specs) =======
  1917. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b3f2049 (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e031bce (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 12bcf81 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 02ba384 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fd3e35e (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 926dfe5 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c54769d (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> e5752db (Featire specs) ======= =======
  1918. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15bff2e (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 1677b1a (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) =======
  1919. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 1830ff1 (Manifest_cache true) ======= ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) =======
  1920. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c346782 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 49e8a6c (Rebased) =======
  1921. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d52ad35 (Rebased) ======= ======= >>>>>>> 872e675 (Fix) =======
  1922. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b28889f (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) >>>>>>> 82f97ce (Fix book_spec decrease quantity and price) ======= >>>>>>> ee78f39 (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 6fa625b (Manifest_cache true) >>>>>>> 0bdcc5e (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) >>>>>>> 5d70f0e (Fix book_spec decrease quantity and price) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 4a43728 (Fix book_spec decrease quantity and price) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 872e675 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307f31f (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= ======= ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) =======
  1923. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 9620751 (Featire specs)
  1924. =======
  1925. >>>>>>> d0dc1f1 (Featire specs) 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8a450ee (Fix book_spec decrease quantity and price) ======= ======= =======
  1926. 1 >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4b921fb (Fix book_spec decrease quantity and price) ======= ======= =======
  1927. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= =======
  1928. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= =======
  1929. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> bc08537 (Fix book_spec decrease quantity and price) ======= =======
  1930. 1 >>>>>>> 7c4ea7f (Fix) >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> d1bae53 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 9620751 (Featire specs)
  1931. =======
  1932. >>>>>>> d0dc1f1 (Featire specs) 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> aaa8a19 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 9dc109d (Featire specs)
  1933. =======
  1934. >>>>>>> d0dc1f1 (Featire specs) 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> ee5935f (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 864f339 (Featire specs) =======
  1935. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4d210c0 (Fix book_spec decrease quantity and price) ======= ======= =======
  1936. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 2956182 (Manifest_cache true) =======
  1937. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 65f3409 (Featire specs)
  1938. =======
  1939. >>>>>>> d0dc1f1 (Featire specs) 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d755be3 (Fix book_spec decrease quantity and price) ======= =======
  1940. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= =======
  1941. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> d15fe1d (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d66884b (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) =======
  1942. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) =======
  1943. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 8879e8b (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) =======
  1944. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1173b70 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  1945. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 9d9ff14 (Manifest_cache true) =======
  1946. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) =======
  1947. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1726bb7 (Fix book_spec decrease quantity and price) ======= =======
  1948. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4e0a8d9 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> da83d1a (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a2a431e (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> e733663 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  1949. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 358c90c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> d59dfbb (Fix book_spec decrease quantity and price) ======= =======
  1950. 1 >>>>>>> c033601 (Rebased) <<<<<<< HEAD >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fa625b (Manifest_cache true) <<<<<<< HEAD >>>>>>> 0c9131d (Manifest_cache true) ======= ======= ======= >>>>>>> 59d75f9 (Featire specs) =======
  1951. 1 >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 44dc97c (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 08e2d9c (Fix book_spec decrease quantity and price) ======= ======= =======
  1952. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= ======= ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 3b839af (Manifest_cache true) =======
  1953. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 587ce47 (Manifest_cache true) ======= ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) =======
  1954. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c2e2926 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 57b2b6b (Fix book_spec decrease quantity and price) ======= =======
  1955. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  1956. 1 >>>>>>> a5d032d (Fix) <<<<<<< HEAD >>>>>>> eaef86a (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 1c3ace6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 75be480 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) =======
  1957. 1 >>>>>>> c336a21 (Fix book_spec decrease quantity and price) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2d71369 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 6e55652 (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 95ebdc2 (Featire specs) =======
  1958. 1 >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> f1c3eb0 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 128e4ae (Fix book_spec decrease quantity and price) ======= ======= ======= >>>>>>> 5a0bcc7 (Featire specs) =======
  1959. 1 >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= ======= ======= >>>>>>> 0832698 (Manifest_cache true) =======
  1960. >>>>>>> 998f08d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> f7f7abc (Manifest_cache true) ======= ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) ======= <<<<<<< HEAD
  1961. 1 >>>>>>> 066fd0b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 1ee9375 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 05602ed (Fix book_spec decrease quantity and price) ======= =======
  1962. 1 >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1a9aba9 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> 4e7b845 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3fef583 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 3c67c09 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> b90c395 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 2b89c06 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 4eeb340 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 574967f (Fix book_spec decrease quantity and price) >>>>>>> 1e11288 (Fix book_spec decrease quantity and price) ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= ======= >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> 02a399d (Manifest_cache true) ======= >>>>>>> ae2a012 (Manifest_cache true) >>>>>>> 7375d4b (Manifest_cache true) >>>>>>> b8aab1a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 04108c4 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> 7b112c2 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 45f6de0 (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= =======
  1963. 1 >>>>>>> bf5c79b (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> a455e8a (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> 7718476 (Fix book_spec decrease quantity and price) ======= ======= =======
  1964. 1 >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= ======= >>>>>>> 59078f6 (Fix book_spec decrease quantity and price) <<<<<<< HEAD >>>>>>> cea736b (Fix book_spec decrease quantity and price) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) Capybara::Selenium::Driver.new(
  1965. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d70f030 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 9ca3b84 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> cae047f (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) >>>>>>> d1bae53 (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) >>>>>>> 35d9b13 (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 1bfc7a6 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= >>>>>>> 95ebdc2 (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 3b839af (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= ======= >>>>>>> 5a0bcc7 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 0832698 (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 9d9ff14 (Manifest_cache true) >>>>>>> 307ac6e (Manifest_cache true)
  1966. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bd8bda4 (Manifest_cache true)
  1967. =======
  1968. >>>>>>> 4e81ea2 (Featire specs) =======
  1969. >>>>>>> aa7b40c (Manifest_cache true) =======
  1970. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) >>>>>>> 5c33a07 (Featire specs) =======
  1971. >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> bcd09ab (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 022e63e (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> 845dac1 (Manifest_cache true) >>>>>>> 5518ff0 (Manifest_cache true) ======= ======= >>>>>>> 59d75f9 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> 96aecde (Manifest_cache true) >>>>>>> 027f794 (Manifest_cache true) ======= ======= >>>>>>> c4adab0 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 2722d07 (Manifest_cache true) >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> 866aee4 (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= ======= >>>>>>> 864f339 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= ======= >>>>>>> b5f64c6 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= ======= >>>>>>> a2de409 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 8c7bad7 (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> fe7e312 (Manifest_cache true) >>>>>>> bdea3aa (Manifest_cache true)
  1972. =======
  1973. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 6edce20 (Manifest_cache true) >>>>>>> a636fda (Featire specs) ======= =======
  1974. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) >>>>>>> b9cc4e9 (Manifest_cache true) ======= =======
  1975. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> d8298a1 (Manifest_cache true) >>>>>>> d2e6b3c (Featire specs) ======= =======
  1976. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  1977. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> bdea3aa (Manifest_cache true) >>>>>>> b832d45 (Featire specs) ======= =======
  1978. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= =======
  1979. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  1980. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> e2d040a (Manifest_cache true) >>>>>>> 9c0d812 (Featire specs) ======= =======
  1981. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD =======
  1982. >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) >>>>>>> 563720e (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= =======
  1983. >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true)
  1984. =======
  1985. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= =======
  1986. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= ======= >>>>>>> a1fe6da (Featire specs) ======= =======
  1987. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= ======= >>>>>>> 027f794 (Manifest_cache true) ======= =======
  1988. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= =======
  1989. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= =======
  1990. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> d1bae53 (Manifest_cache true) ======= =======
  1991. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= =======
  1992. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= =======
  1993. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 13fd74f (Featire specs) ======= =======
  1994. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> f7f7abc (Manifest_cache true) ======= =======
  1995. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= =======
  1996. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= =======
  1997. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= =======
  1998. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 3e9f99d (Featire specs) ======= ======= =======
  1999. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= =======
  2000. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 5be567f (Featire specs) ======= ======= =======
  2001. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 2ee03d3 (Featire specs) ======= ======= >>>>>>> ed97c39 (Manifest_cache true) ======= =======
  2002. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> 20256f8 (Featire specs) ======= =======
  2003. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 587ce47 (Manifest_cache true) ======= =======
  2004. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8874887 (Manifest_cache true) ======= =======
  2005. >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= ======= >>>>>>> b35d1f8 (Featire specs)
  2006. =======
  2007. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= ======= =======
  2008. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= ======= =======
  2009. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 59d75f9 (Featire specs) <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= ======= =======
  2010. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 96aecde (Manifest_cache true) <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= ======= =======
  2011. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= ======= =======
  2012. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= ======= =======
  2013. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= ======= =======
  2014. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= ======= =======
  2015. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= ======= =======
  2016. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= ======= =======
  2017. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> a9e654b (Manifest_cache true) ======= =======
  2018. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 0b5b269 (Fix) ======= >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> d6f7da8 (Featire specs) ======= ======= =======
  2019. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ab67c96 (Manifest_cache true) ======= ======= =======
  2020. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> f5da5ac (Featire specs) ======= ======= =======
  2021. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 036bb32 (Manifest_cache true) ======= ======= =======
  2022. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= =======
  2023. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 3e8974a (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= =======
  2024. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 23e9df9 (Manifest_cache true) ======= ======= =======
  2025. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= =======
  2026. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9617beb (Manifest_cache true) ======= ======= =======
  2027. >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= =======
  2028. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b40a04e (Manifest_cache true) ======= =======
  2029. >>>>>>> 8f1bc14 (Fix) >>>>>>> 1ac6be1 (Fix) =======
  2030. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> a636fda (Featire specs) >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> a636fda (Featire specs) ======= =======
  2031. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> b9cc4e9 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 902b803 (Manifest_cache true) ======= ======= =======
  2032. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= =======
  2033. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b763f5b (Manifest_cache true) ======= ======= =======
  2034. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= =======
  2035. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 4a0e3b6 (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= =======
  2036. >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 9620751 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= =======
  2037. >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= =======
  2038. =======
  2039. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 9dc109d (Featire specs) <<<<<<< HEAD >>>>>>> dacfb20 (Featire specs) ======= ======= =======
  2040. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 459d812 (Manifest_cache true) ======= ======= =======
  2041. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 864f339 (Featire specs) <<<<<<< HEAD >>>>>>> 93db8b1 (Featire specs) ======= ======= =======
  2042. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b5f64c6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> b746b60 (Manifest_cache true) ======= ======= =======
  2043. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD >>>>>>> 5f76842 (Featire specs) ======= ======= =======
  2044. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e965665 (Manifest_cache true) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD >>>>>>> ea0650c (Featire specs) ======= ======= =======
  2045. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 10b6c72 (Manifest_cache true) ======= ======= =======
  2046. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD >>>>>>> a038b16 (Featire specs) ======= ======= =======
  2047. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) <<<<<<< HEAD >>>>>>> a77cc8a (Manifest_cache true) ======= ======= =======
  2048. >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD >>>>>>> d7fadcd (Featire specs) ======= ======= =======
  2049. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 39467b5 (Manifest_cache true) ======= =======
  2050. >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 49e3b70 (Fix) ======= =======
  2051. =======
  2052. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 65f3409 (Featire specs) <<<<<<< HEAD >>>>>>> 78d0719 (Featire specs) ======= ======= =======
  2053. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6edce20 (Manifest_cache true) ======= ======= =======
  2054. >>>>>>> 752f0c0 (Featire specs) >>>>>>> c1749d5 (Featire specs) <<<<<<< HEAD >>>>>>> f861b82 (Featire specs) ======= ======= =======
  2055. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 3c386ca (Manifest_cache true) <<<<<<< HEAD >>>>>>> d8298a1 (Manifest_cache true) ======= ======= =======
  2056. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= =======
  2057. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) <<<<<<< HEAD >>>>>>> bdea3aa (Manifest_cache true) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= =======
  2058. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 07682bd (Manifest_cache true) ======= ======= =======
  2059. >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= =======
  2060. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) <<<<<<< HEAD >>>>>>> e2d040a (Manifest_cache true) ======= ======= =======
  2061. >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= =======
  2062. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 307ac6e (Manifest_cache true) ======= =======
  2063. >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) app,
  2064. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 5507b42 (Featire specs) ======= >>>>>>> e9f3851 (Manifest_cache true) ======= >>>>>>> af057e3 (Featire specs) ======= >>>>>>> d782a28 (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> be2f578 (Manifest_cache true) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased)
  2065. browser: :chrome,
  2066. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= ======= <<<<<<< HEAD ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> b00b319 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 86d584a (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> b459807 (Manifest_cache true) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> e5752db (Featire specs) ======= >>>>>>> 2ba25f7 (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 5b6aeb7 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= ======= >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> 2c640cf (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= ======= >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> b15044a (Manifest_cache true) <<<<<<< HEAD >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= ======= >>>>>>> b832d45 (Featire specs) >>>>>>> 113da87 (Featire specs)
  2067. ======= >>>>>>> 93bdda9 (Featire specs)
  2068. >>>>>>> d0dc1f1 (Featire specs) =======
  2069. >>>>>>> 02a399d (Manifest_cache true) =======
  2070. >>>>>>> 752f0c0 (Featire specs) =======
  2071. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  2072. >>>>>>> 4e81ea2 (Featire specs) =======
  2073. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  2074. >>>>>>> 08edf50 (Featire specs) =======
  2075. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  2076. >>>>>>> 7a02bbe (Featire specs) =======
  2077. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> bf554f4 (Rebased)
  2078. >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= ======= >>>>>>> b9cc4e9 (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true)
  2079. =======
  2080. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= =======
  2081. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= =======
  2082. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
  2083. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
  2084. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> 35d17b9 (Manifest_cache true) ======= =======
  2085. >>>>>>> 08edf50 (Featire specs) >>>>>>> ee5242b (Featire specs) ======= >>>>>>> add330c (Manifest_cache true) ======= =======
  2086. >>>>>>> 7a02bbe (Featire specs) >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 15bff2e (Manifest_cache true) ======= =======
  2087. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
  2088. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) ======= ======= >>>>>>> 7c4ea7f (Fix)
  2089. >>>>>>> 1d59aaa (Fix) =======
  2090. >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD browser: :chrome, ======= http_client: client, >>>>>>> cde4834 (Manifest_cache true)
  2091. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 8874887 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs)
  2092. ======= >>>>>>> 2a25e4c (Featire specs)
  2093. >>>>>>> d0dc1f1 (Featire specs) ======= =======
  2094. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9bebee5 (Manifest_cache true) ======= =======
  2095. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= =======
  2096. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 0b43b18 (Manifest_cache true) ======= =======
  2097. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> caaaa41 (Manifest_cache true) ======= =======
  2098. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 5506bd0 (Featire specs) ======= =======
  2099. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  2100. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= =======
  2101. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= =======
  2102. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= =======
  2103. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= =======
  2104. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= =======
  2105. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= =======
  2106. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= =======
  2107. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= =======
  2108. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= =======
  2109. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= =======
  2110. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= =======
  2111. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= =======
  2112. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= =======
  2113. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> d6f7da8 (Featire specs) ======= =======
  2114. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> ab67c96 (Manifest_cache true) ======= =======
  2115. >>>>>>> 752f0c0 (Featire specs) >>>>>>> f5da5ac (Featire specs) ======= =======
  2116. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 036bb32 (Manifest_cache true) ======= =======
  2117. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f79779 (Featire specs) ======= =======
  2118. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 3e8974a (Manifest_cache true) ======= =======
  2119. >>>>>>> 08edf50 (Featire specs) >>>>>>> 56a05fb (Featire specs) ======= =======
  2120. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 23e9df9 (Manifest_cache true) ======= =======
  2121. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 6d21330 (Featire specs) ======= =======
  2122. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 9617beb (Manifest_cache true) ======= =======
  2123. >>>>>>> 4552227 (Featire specs) >>>>>>> 27e3351 (Featire specs) ======= =======
  2124. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) =======
  2125. >>>>>>> cde4834 (Manifest_cache true) <<<<<<< HEAD browser: :chrome,
  2126. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> be2f578 (Manifest_cache true) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> ed97c39 (Manifest_cache true) ======= ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> 587ce47 (Manifest_cache true)
  2127. ======= >>>>>>> 8c32a77 (Featire specs)
  2128. >>>>>>> d0dc1f1 (Featire specs) ======= =======
  2129. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= =======
  2130. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> b763f5b (Manifest_cache true) ======= =======
  2131. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= =======
  2132. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> be2f578 (Manifest_cache true) ======= =======
  2133. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= =======
  2134. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> ed97c39 (Manifest_cache true) ======= =======
  2135. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) ======= =======
  2136. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix)
  2137. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  2138. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= =======
  2139. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= =======
  2140. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= =======
  2141. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= =======
  2142. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= =======
  2143. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= =======
  2144. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= =======
  2145. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= =======
  2146. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= =======
  2147. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= =======
  2148. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= =======
  2149. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= =======
  2150. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= =======
  2151. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= =======
  2152. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= =======
  2153. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= =======
  2154. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= =======
  2155. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= =======
  2156. >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= =======
  2157. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= =======
  2158. >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= =======
  2159. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= =======
  2160. >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= =======
  2161. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= =======
  2162. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= =======
  2163. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 6edce20 (Manifest_cache true) ======= =======
  2164. >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= =======
  2165. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d8298a1 (Manifest_cache true) ======= =======
  2166. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= =======
  2167. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> bdea3aa (Manifest_cache true) ======= =======
  2168. >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= =======
  2169. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 07682bd (Manifest_cache true) ======= =======
  2170. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= =======
  2171. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> e2d040a (Manifest_cache true) ======= =======
  2172. >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= =======
  2173. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) browser: :chrome,
  2174. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= >>>>>>> a636fda (Featire specs) ======= >>>>>>> b9cc4e9 (Manifest_cache true) ======= >>>>>>> d2e6b3c (Featire specs) ======= >>>>>>> c8cdb08 (Manifest_cache true) ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) ======= >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 59d75f9 (Featire specs) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  2175. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= http_client: client, >>>>>>> bebaea7 (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 1577aeb (Rebased) http_client: client, >>>>>>> 078304c (Rebased) <<<<<<< HEAD ======= ======= >>>>>>> 836a973 (Rebased) http_client: client, >>>>>>> 49e8a6c (Rebased) <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) http_client: client, <<<<<<< HEAD ======= http_client: client, >>>>>>> df37394 (Featire specs) ======= http_client: client, >>>>>>> 715fac2 (Featire specs) ======= http_client: client, >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ) ======= ======= ======= >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= >>>>>>> 4a0e3b6 (Manifest_cache true) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 24b58e6 (Manifest_cache true) ======= >>>>>>> 9c0d812 (Featire specs) ======= >>>>>>> 00f8b58 (Manifest_cache true) <<<<<<< HEAD ======= ======= ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ) ======= options: options >>>>>>> 752f0c0 (Featire specs) ======= http_client: client, >>>>>>> 4e81ea2 (Featire specs) ======= browser: :chrome, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= http_client: client, >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 715fac2 (Featire specs) ======= ======= http_client: client, >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= http_client: client, >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) ======= >>>>>>> bebaea7 (Rebased)
  2176. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bf554f4 (Rebased) <<<<<<< HEAD <<<<<<< HEAD
  2177. ======= ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> b763f5b (Manifest_cache true) <<<<<<< HEAD
  2178. =======
  2179. >>>>>>> d0dc1f1 (Featire specs) =======
  2180. >>>>>>> 02a399d (Manifest_cache true) =======
  2181. >>>>>>> 752f0c0 (Featire specs) =======
  2182. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b00b319 (Manifest_cache true) ======= =======
  2183. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9bf83f (Featire specs) ======= =======
  2184. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 86d584a (Manifest_cache true) ======= =======
  2185. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 904663c (Featire specs) ======= =======
  2186. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b459807 (Manifest_cache true) ======= =======
  2187. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e5752db (Featire specs) ======= =======
  2188. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2ba25f7 (Manifest_cache true) =======
  2189. >>>>>>> 49e8a6c (Rebased) ======= ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix)
  2190. <<<<<<< HEAD =======
  2191. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 5507b42 (Featire specs) ======= =======
  2192. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD >>>>>>> e9f3851 (Manifest_cache true) ======= =======
  2193. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> af057e3 (Featire specs) ======= =======
  2194. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> d782a28 (Manifest_cache true) ======= =======
  2195. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= =======
  2196. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 35d17b9 (Manifest_cache true) ======= =======
  2197. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= =======
  2198. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> add330c (Manifest_cache true) ======= =======
  2199. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= =======
  2200. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 15bff2e (Manifest_cache true) ======= =======
  2201. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= =======
  2202. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 6c71f00 (Manifest_cache true) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 394c6f3 (Manifest_cache true) ======= =======
  2203. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5be567f (Featire specs) ======= =======
  2204. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 0b43b18 (Manifest_cache true) ======= =======
  2205. >>>>>>> 08edf50 (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= =======
  2206. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> caaaa41 (Manifest_cache true) ======= =======
  2207. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= =======
  2208. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 8874887 (Manifest_cache true) ======= ======= >>>>>>> b4763a2 (Featire specs) ======= >>>>>>> dcf74e1 (Manifest_cache true) ======= >>>>>>> bcd09ab (Featire specs) ======= >>>>>>> 022e63e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 10bdfea (Manifest_cache true) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> d70f030 (Manifest_cache true) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> cae047f (Manifest_cache true) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> d6f7da8 (Featire specs) ======= >>>>>>> ab67c96 (Manifest_cache true) ======= >>>>>>> f5da5ac (Featire specs) ======= >>>>>>> 036bb32 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 3e8974a (Manifest_cache true) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 23e9df9 (Manifest_cache true) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 9617beb (Manifest_cache true) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> 6edce20 (Manifest_cache true) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d8298a1 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bdea3aa (Manifest_cache true) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 07682bd (Manifest_cache true) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> e2d040a (Manifest_cache true) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> c1749d5 (Featire specs) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true) ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path)
  2209. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 078304c (Rebased) ======= =======
  2210. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b4763a2 (Featire specs) ======= =======
  2211. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> dcf74e1 (Manifest_cache true) ======= =======
  2212. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bcd09ab (Featire specs) ======= =======
  2213. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 022e63e (Manifest_cache true) ======= =======
  2214. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c006a44 (Featire specs) ======= =======
  2215. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 10bdfea (Manifest_cache true) ======= =======
  2216. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 848bfa2 (Featire specs) ======= =======
  2217. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d70f030 (Manifest_cache true) ======= =======
  2218. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9ca3b84 (Featire specs) ======= =======
  2219. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cae047f (Manifest_cache true) ======= =======
  2220. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> fefbd35 (Featire specs) ======= =======
  2221. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> a9e654b (Manifest_cache true) ======= >>>>>>> 0b5b269 (Fix) ======= =======
  2222. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> d6f7da8 (Featire specs) ======= =======
  2223. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> ab67c96 (Manifest_cache true) ======= =======
  2224. >>>>>>> 752f0c0 (Featire specs) >>>>>>> f5da5ac (Featire specs) ======= =======
  2225. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> 036bb32 (Manifest_cache true) ======= =======
  2226. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f79779 (Featire specs) ======= =======
  2227. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 3e8974a (Manifest_cache true) ======= =======
  2228. >>>>>>> 08edf50 (Featire specs) >>>>>>> 56a05fb (Featire specs) ======= =======
  2229. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 23e9df9 (Manifest_cache true) ======= =======
  2230. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 6d21330 (Featire specs) ======= =======
  2231. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 9617beb (Manifest_cache true) ======= =======
  2232. >>>>>>> 4552227 (Featire specs) >>>>>>> 27e3351 (Featire specs) ======= =======
  2233. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b40a04e (Manifest_cache true) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> b763f5b (Manifest_cache true) ======= =======
  2234. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 113da87 (Featire specs) ======= =======
  2235. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> be2f578 (Manifest_cache true) ======= =======
  2236. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= =======
  2237. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> ed97c39 (Manifest_cache true) ======= =======
  2238. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= =======
  2239. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 587ce47 (Manifest_cache true) ======= ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> 5518ff0 (Manifest_cache true) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 027f794 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> e2bfd89 (Manifest_cache true) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> d1bae53 (Manifest_cache true) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 35d9b13 (Manifest_cache true) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 459d812 (Manifest_cache true) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> b746b60 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> e965665 (Manifest_cache true) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 10b6c72 (Manifest_cache true) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> a77cc8a (Manifest_cache true) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) >>>>>>> bf554f4 (Rebased) ======= <<<<<<< HEAD >>>>>>> 9620751 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 845dac1 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 59d75f9 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 96aecde (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> c4adab0 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2722d07 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD >>>>>>> 5b6aeb7 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 2c640cf (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> 864f339 (Featire specs) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 8f1bc14 (Fix)
  2240. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= =======
  2241. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b35d1f8 (Featire specs) ======= =======
  2242. >>>>>>> 02a399d (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5518ff0 (Manifest_cache true) ======= =======
  2243. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a1fe6da (Featire specs) ======= =======
  2244. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 027f794 (Manifest_cache true) ======= =======
  2245. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= =======
  2246. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> e2bfd89 (Manifest_cache true) ======= =======
  2247. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= =======
  2248. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d1bae53 (Manifest_cache true) ======= =======
  2249. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= =======
  2250. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 35d9b13 (Manifest_cache true) ======= =======
  2251. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) ======= =======
  2252. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> f7f7abc (Manifest_cache true) ======= >>>>>>> 1a9aba9 (Fix) ======= =======
  2253. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= =======
  2254. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 459d812 (Manifest_cache true) ======= =======
  2255. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= =======
  2256. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> b746b60 (Manifest_cache true) ======= =======
  2257. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= =======
  2258. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> e965665 (Manifest_cache true) ======= =======
  2259. >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= =======
  2260. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 10b6c72 (Manifest_cache true) ======= =======
  2261. >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= =======
  2262. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> a77cc8a (Manifest_cache true) ======= =======
  2263. >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= =======
  2264. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 39467b5 (Manifest_cache true) ======= >>>>>>> 49e3b70 (Fix) ======= =======
  2265. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= =======
  2266. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 6edce20 (Manifest_cache true) ======= =======
  2267. >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= =======
  2268. >>>>>>> bd8bda4 (Manifest_cache true) >>>>>>> d8298a1 (Manifest_cache true) ======= =======
  2269. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= =======
  2270. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> bdea3aa (Manifest_cache true) ======= =======
  2271. >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= =======
  2272. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 07682bd (Manifest_cache true) ======= =======
  2273. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= =======
  2274. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> e2d040a (Manifest_cache true) ======= =======
  2275. >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= =======
  2276. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 307ac6e (Manifest_cache true) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= <<<<<<< HEAD >>>>>>> ee78f39 (Rebased) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b00b319 (Manifest_cache true) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> 394c6f3 (Manifest_cache true) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> c8cdb08 (Manifest_cache true) >>>>>>> b763f5b (Manifest_cache true) options: options >>>>>>> 752f0c0 (Featire specs) ======= http_client: client, >>>>>>> 4e81ea2 (Featire specs) ======= browser: :chrome, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= http_client: client, >>>>>>> c033601 (Rebased)
  2277. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs)
  2278. =======
  2279. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  2280. >>>>>>> 02a399d (Manifest_cache true) =======
  2281. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  2282. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  2283. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  2284. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) <<<<<<< HEAD <<<<<<< HEAD options: options ======= <<<<<<< HEAD options: options >>>>>>> df37394 (Featire specs) ======= options: options >>>>>>> 715fac2 (Featire specs) ======= options: options >>>>>>> 3dc272d (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ) ======= options: options >>>>>>> 4e81ea2 (Featire specs) ======= http_client: client, >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= options: options >>>>>>> c033601 (Rebased) ======= >>>>>>> df37394 (Featire specs) ======= ======= options: options >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 715fac2 (Featire specs) ======= ======= options: options >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= options: options >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ======= ======= options: options >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased)
  2285. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> c033601 (Rebased) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
  2286. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 93bdda9 (Featire specs) ======= >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 2a25e4c (Featire specs) ======= >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 902b803 (Manifest_cache true)
  2287. =======
  2288. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  2289. >>>>>>> 02a399d (Manifest_cache true) =======
  2290. >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 93bdda9 (Featire specs) ======= =======
  2291. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 7945032 (Manifest_cache true) ======= >>>>>>> 2a25e4c (Featire specs) ======= =======
  2292. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 9bebee5 (Manifest_cache true) ======= >>>>>>> 8c32a77 (Featire specs) ======= =======
  2293. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 902b803 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> df37394 (Featire specs) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
  2294. <<<<<<< HEAD <<<<<<< HEAD
  2295. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs)
  2296. =======
  2297. >>>>>>> d0dc1f1 (Featire specs) =======
  2298. >>>>>>> 02a399d (Manifest_cache true) =======
  2299. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  2300. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  2301. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  2302. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  2303. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  2304. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  2305. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  2306. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 00f8b58 (Manifest_cache true) =======
  2307. >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 563720e (Featire specs) ======= >>>>>>> 3e9f99d (Featire specs) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> 715fac2 (Featire specs) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
  2308. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  2309. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true)
  2310. =======
  2311. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD =======
  2312. >>>>>>> 02a399d (Manifest_cache true) =======
  2313. >>>>>>> 752f0c0 (Featire specs) =======
  2314. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  2315. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  2316. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  2317. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  2318. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  2319. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  2320. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
  2321. >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= =======
  2322. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= =======
  2323. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= =======
  2324. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  2325. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
  2326. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  2327. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  2328. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  2329. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  2330. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  2331. >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> df37394 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> ee78f39 (Rebased) ======= <<<<<<< HEAD ======= >>>>>>> 836a973 (Rebased) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= ======= >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 3dc272d (Featire specs) ) ======= options: options >>>>>>> 08edf50 (Featire specs)
  2332. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  2333. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true)
  2334. =======
  2335. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  2336. >>>>>>> 02a399d (Manifest_cache true) =======
  2337. >>>>>>> 752f0c0 (Featire specs) =======
  2338. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  2339. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  2340. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  2341. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  2342. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  2343. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  2344. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
  2345. >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= =======
  2346. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= =======
  2347. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= =======
  2348. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  2349. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
  2350. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  2351. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  2352. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  2353. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  2354. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  2355. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= =======
  2356. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= =======
  2357. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= =======
  2358. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) ======= =======
  2359. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= =======
  2360. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) ======= =======
  2361. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) ======= =======
  2362. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) ======= =======
  2363. >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) ======= =======
  2364. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) =======
  2365. >>>>>>> 8f1bc14 (Fix) =======
  2366. >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> 56ef3ac (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 715fac2 (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 836a973 (Rebased) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 1577aeb (Rebased) ======= <<<<<<< HEAD >>>>>>> 4e81ea2 (Featire specs) ======= )
  2367. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  2368. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 9620751 (Featire specs) ======= >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= >>>>>>> c4adab0 (Featire specs) ======= >>>>>>> 2722d07 (Manifest_cache true) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 5b6aeb7 (Manifest_cache true) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 2c640cf (Manifest_cache true) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> b15044a (Manifest_cache true) ======= >>>>>>> 9dc109d (Featire specs) ======= >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= >>>>>>> a2de409 (Featire specs) ======= >>>>>>> 8c7bad7 (Manifest_cache true) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> 1bfc7a6 (Manifest_cache true) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> 3b839af (Manifest_cache true) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> 0832698 (Manifest_cache true) ======= >>>>>>> 65f3409 (Featire specs) ======= >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= >>>>>>> 1cb2e82 (Featire specs) ======= >>>>>>> fe7e312 (Manifest_cache true) ======= >>>>>>> 8577deb (Featire specs) ======= >>>>>>> 94d9078 (Manifest_cache true) ======= >>>>>>> ebe5361 (Featire specs) ======= >>>>>>> 2956182 (Manifest_cache true) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 9d9ff14 (Manifest_cache true)
  2369. =======
  2370. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD =======
  2371. >>>>>>> 02a399d (Manifest_cache true) =======
  2372. >>>>>>> 752f0c0 (Featire specs) =======
  2373. >>>>>>> bd8bda4 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> c8cdb08 (Manifest_cache true) ======= =======
  2374. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> b832d45 (Featire specs) ======= =======
  2375. >>>>>>> aa7b40c (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 4a0e3b6 (Manifest_cache true) ======= =======
  2376. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= =======
  2377. >>>>>>> 183b6c5 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 24b58e6 (Manifest_cache true) ======= =======
  2378. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 9c0d812 (Featire specs) ======= =======
  2379. >>>>>>> fd6db03 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 00f8b58 (Manifest_cache true) =======
  2380. >>>>>>> bf554f4 (Rebased) ======= >>>>>>> 9620751 (Featire specs) ======= =======
  2381. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 845dac1 (Manifest_cache true) ======= >>>>>>> 96aecde (Manifest_cache true) ======= =======
  2382. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) ======= =======
  2383. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 2722d07 (Manifest_cache true) ======= =======
  2384. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54deeb (Featire specs) ======= =======
  2385. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 5b6aeb7 (Manifest_cache true) ======= =======
  2386. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) ======= =======
  2387. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2c640cf (Manifest_cache true) ======= =======
  2388. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 94841b5 (Featire specs) ======= =======
  2389. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> b15044a (Manifest_cache true) =======
  2390. >>>>>>> 7c4ea7f (Fix) ======= >>>>>>> 9dc109d (Featire specs) ======= =======
  2391. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> 866aee4 (Manifest_cache true) ======= >>>>>>> b5f64c6 (Manifest_cache true) ======= =======
  2392. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) ======= =======
  2393. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> 8c7bad7 (Manifest_cache true) ======= =======
  2394. >>>>>>> 08edf50 (Featire specs) >>>>>>> e54ceb0 (Featire specs) ======= =======
  2395. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 1bfc7a6 (Manifest_cache true) ======= =======
  2396. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) ======= =======
  2397. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 3b839af (Manifest_cache true) ======= =======
  2398. >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) ======= =======
  2399. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 0832698 (Manifest_cache true) =======
  2400. >>>>>>> 8f1bc14 (Fix) ======= >>>>>>> 65f3409 (Featire specs) ======= =======
  2401. >>>>>>> 02a399d (Manifest_cache true) >>>>>>> e991554 (Manifest_cache true) ======= >>>>>>> 3c386ca (Manifest_cache true) ======= =======
  2402. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) ======= =======
  2403. >>>>>>> aa7b40c (Manifest_cache true) >>>>>>> fe7e312 (Manifest_cache true) ======= =======
  2404. >>>>>>> 08edf50 (Featire specs) >>>>>>> 8577deb (Featire specs) ======= =======
  2405. >>>>>>> 183b6c5 (Manifest_cache true) >>>>>>> 94d9078 (Manifest_cache true) ======= =======
  2406. >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) ======= =======
  2407. >>>>>>> fd6db03 (Manifest_cache true) >>>>>>> 2956182 (Manifest_cache true) ======= =======
  2408. >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) ======= =======
  2409. >>>>>>> 998f08d (Manifest_cache true) >>>>>>> 9d9ff14 (Manifest_cache true) =======
  2410. >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 08edf50 (Featire specs) >>>>>>> 5c33a07 (Featire specs) <<<<<<< HEAD >>>>>>> 3dc272d (Featire specs) ======= ======= >>>>>>> c033601 (Rebased) >>>>>>> 1577aeb (Rebased) end

spec/support/configs/shoulda_matcher.rb

100.0% lines covered

5 relevant lines. 5 lines covered and 0 lines missed.
    
  1. 1 Shoulda::Matchers.configure do |config|
  2. 1 config.integrate do |with|
  3. 1 with.test_framework :rspec
  4. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 8c32a77 (Featire specs) ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs)
  5. 1 =======
  6. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= >>>>>>> d0dc1f1 (Featire specs) =======
  7. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) =======
  8. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) =======
  9. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) =======
  10. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) =======
  11. 1 >>>>>>> bebaea7 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======
  12. >>>>>>> 4552227 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 13fd74f (Featire specs) =======
  13. 1 >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) =======
  14. 1 >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) =======
  15. 1 >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) with.library :active_record <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Keep as many of these lines as are necessary: >>>>>>> cde4834 (Manifest_cache true)
  16. =======
  17. >>>>>>> 1577aeb (Rebased) 1 ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 8c32a77 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> 8c32a77 (Featire specs) with.library :active_record ======= # Keep as many of these lines as are necessary: >>>>>>> d0dc1f1 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Keep as many of these lines as are necessary: >>>>>>> 4e81ea2 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> bebaea7 (Rebased) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= ======= # Keep as many of these lines as are necessary: >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= # Keep as many of these lines as are necessary: >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)
  18. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) <<<<<<< HEAD ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 08edf50 (Featire specs) ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= >>>>>>> b35d1f8 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> dacfb20 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 78d0719 (Featire specs) ======= ======= ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) with.library :active_record
  19. 1 <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= ======= >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ed6aebd (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= >>>>>>> d0dc1f1 (Featire specs) ======= >>>>>>> 752f0c0 (Featire specs) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) with.library :active_model
  20. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  21. =======
  22. >>>>>>> cde4834 (Manifest_cache true) =======
  23. >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs)
  24. =======
  25. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= =======
  26. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= =======
  27. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= =======
  28. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= =======
  29. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) =======
  30. >>>>>>> bebaea7 (Rebased) =======
  31. =======
  32. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= =======
  33. >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= =======
  34. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= =======
  35. >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= =======
  36. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= =======
  37. >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) =======
  38. >>>>>>> 1a9aba9 (Fix) =======
  39. =======
  40. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= =======
  41. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= =======
  42. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= =======
  43. >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= =======
  44. >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= =======
  45. >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) =======
  46. >>>>>>> 49e3b70 (Fix) =======
  47. =======
  48. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= =======
  49. >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= =======
  50. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= =======
  51. >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= =======
  52. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= =======
  53. >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) =======
  54. >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) end
  55. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
  56. =======
  57. >>>>>>> cde4834 (Manifest_cache true) =======
  58. >>>>>>> 1577aeb (Rebased) ======= ======= >>>>>>> 56ef3ac (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> a1fe6da (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 93db8b1 (Featire specs) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> f861b82 (Featire specs) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs)
  59. =======
  60. >>>>>>> d0dc1f1 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8c32a77 (Featire specs) ======= =======
  61. >>>>>>> 752f0c0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56ef3ac (Featire specs) ======= =======
  62. >>>>>>> 4e81ea2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 113da87 (Featire specs) ======= =======
  63. >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 8b420cf (Featire specs) ======= =======
  64. >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 20256f8 (Featire specs) =======
  65. >>>>>>> bebaea7 (Rebased) =======
  66. =======
  67. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> b35d1f8 (Featire specs) ======= =======
  68. >>>>>>> 752f0c0 (Featire specs) >>>>>>> a1fe6da (Featire specs) ======= =======
  69. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 28fed3c (Featire specs) ======= =======
  70. >>>>>>> 08edf50 (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= =======
  71. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 64d4167 (Featire specs) ======= =======
  72. >>>>>>> 4552227 (Featire specs) >>>>>>> 13fd74f (Featire specs) =======
  73. >>>>>>> 1a9aba9 (Fix) =======
  74. =======
  75. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> dacfb20 (Featire specs) ======= =======
  76. >>>>>>> 752f0c0 (Featire specs) >>>>>>> 93db8b1 (Featire specs) ======= =======
  77. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 5f76842 (Featire specs) ======= =======
  78. >>>>>>> 08edf50 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= =======
  79. >>>>>>> 7a02bbe (Featire specs) >>>>>>> a038b16 (Featire specs) ======= =======
  80. >>>>>>> 4552227 (Featire specs) >>>>>>> d7fadcd (Featire specs) =======
  81. >>>>>>> 49e3b70 (Fix) =======
  82. =======
  83. >>>>>>> d0dc1f1 (Featire specs) >>>>>>> 78d0719 (Featire specs) ======= =======
  84. >>>>>>> 752f0c0 (Featire specs) >>>>>>> f861b82 (Featire specs) ======= =======
  85. >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 2fd2048 (Featire specs) ======= =======
  86. >>>>>>> 08edf50 (Featire specs) >>>>>>> bc0ff2c (Featire specs) ======= =======
  87. >>>>>>> 7a02bbe (Featire specs) >>>>>>> 9bf2aae (Featire specs) ======= =======
  88. >>>>>>> 4552227 (Featire specs) >>>>>>> 5ce1a6d (Featire specs) =======
  89. >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) end

spec/support/configs/sidekiq.rb

100.0% lines covered

2 relevant lines. 2 lines covered and 0 lines missed.
    
  1. 1 RSpec::Sidekiq.configure do |config|
  2. 1 config.warn_when_jobs_not_processed_by_sidekiq = false
  3. end
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> e5e300f (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> f0a057d (Manifest_cache true) ======= >>>>>>> 96394f1 (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 1d59aaa (Fix) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 07edb26 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 078304c (Rebased) ======= >>>>>>> 59f060e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 0b5b269 (Fix) ======= >>>>>>> f1f4057 (Manifest_cache true) ======= >>>>>>> 5f79779 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> eda022f (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 590c4c7 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> e6da150 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 49e3b70 (Fix) ======= >>>>>>> 9710ee6 (Manifest_cache true) ======= >>>>>>> 2fd2048 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) ======= >>>>>>> 20094c5 (After billing and shipping change redirect to prev path) ======= >>>>>>> 379e583 (Manifest_cache true) ======= <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> df37394 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 3723aad (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> e54deeb (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 3b03895 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 94841b5 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> e54ceb0 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> 95ebdc2 (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> 5a0bcc7 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 8577deb (Featire specs) ======= <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> ebe5361 (Featire specs) ======= <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= >>>>>>> d3d58e0 (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) ======= >>>>>>> 08edf50 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= >>>>>>> ee5242b (Featire specs) ======= >>>>>>> a9e66e9 (Featire specs) ======= >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 5506bd0 (Featire specs) ======= >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 56a05fb (Featire specs) ======= >>>>>>> 6d21330 (Featire specs) ======= >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 20256f8 (Featire specs) ======= >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> bc0ff2c (Featire specs) ======= >>>>>>> 9bf2aae (Featire specs) >>>>>>> 5c33a07 (Featire specs) ======= >>>>>>> c033601 (Rebased) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> e5e300f (Manifest_cache true) ======= >>>>>>> 07edb26 (Manifest_cache true) ======= >>>>>>> eda022f (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 4d1f738 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> a9bf83f (Featire specs) ======= >>>>>>> 5be567f (Featire specs) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> b832d45 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> 3723aad (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 27e3351 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= >>>>>>> 5ce1a6d (Featire specs) >>>>>>> 9c0d812 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= >>>>>>> bf554f4 (Rebased) ======= ======= >>>>>>> 379e583 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5bc98da (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> df37394 (Featire specs) ======= >>>>>>> ee78f39 (Rebased) ======= >>>>>>> e5e300f (Manifest_cache true) ======= >>>>>>> a9bf83f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 904663c (Featire specs) ======= >>>>>>> e5752db (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 49e8a6c (Rebased) ======= >>>>>>> 1772e92 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f0a057d (Manifest_cache true) ======= ======= >>>>>>> c006a44 (Featire specs) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> c4adab0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 96394f1 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> ee5242b (Featire specs) ======= ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 3b03895 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> a9e66e9 (Featire specs) ======= ======= >>>>>>> fefbd35 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 94841b5 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6fba6be (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 1d59aaa (Fix) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 1ebea35 (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 715fac2 (Featire specs) ======= >>>>>>> 836a973 (Rebased) ======= >>>>>>> 07edb26 (Manifest_cache true) ======= >>>>>>> 5be567f (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 2ee03d3 (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 5506bd0 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> 078304c (Rebased) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 59f060e (Manifest_cache true) ======= >>>>>>> c006a44 (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> 848bfa2 (Featire specs) ======= >>>>>>> 9ca3b84 (Featire specs) ======= >>>>>>> fefbd35 (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 0b5b269 (Fix) ======= ======= >>>>>>> e6da150 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 7f9bd73 (Manifest_cache true) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> f1f4057 (Manifest_cache true) ======= ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> a2de409 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 5f79779 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 56a05fb (Featire specs) ======= ======= >>>>>>> a038b16 (Featire specs) ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> 95ebdc2 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 6d21330 (Featire specs) ======= ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> 5a0bcc7 (Featire specs) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD >>>>>>> 27e3351 (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) <<<<<<< HEAD >>>>>>> 1ac6be1 (Fix) ======= >>>>>>> cde4834 (Manifest_cache true) ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> 2737f2d (Manifest_cache true) ======= >>>>>>> 5c33a07 (Featire specs) >>>>>>> 3dc272d (Featire specs) ======= >>>>>>> 1577aeb (Rebased) ======= >>>>>>> eda022f (Manifest_cache true) ======= >>>>>>> 113da87 (Featire specs) ======= ======= >>>>>>> 3723aad (Featire specs) >>>>>>> 8b420cf (Featire specs) ======= >>>>>>> 9c0d812 (Featire specs) >>>>>>> 20256f8 (Featire specs) ======= ======= >>>>>>> bf554f4 (Rebased) >>>>>>> bebaea7 (Rebased) ======= >>>>>>> 1772e92 (Manifest_cache true) >>>>>>> 590c4c7 (Manifest_cache true) ======= >>>>>>> 28fed3c (Featire specs) ======= ======= >>>>>>> e54deeb (Featire specs) >>>>>>> ed6aebd (Featire specs) ======= >>>>>>> 64d4167 (Featire specs) ======= >>>>>>> 13fd74f (Featire specs) ======= ======= >>>>>>> 7c4ea7f (Fix) >>>>>>> 1a9aba9 (Fix) ======= >>>>>>> e6da150 (Manifest_cache true) ======= >>>>>>> 5f76842 (Featire specs) ======= ======= >>>>>>> e54ceb0 (Featire specs) >>>>>>> ea0650c (Featire specs) ======= >>>>>>> a038b16 (Featire specs) ======= >>>>>>> d7fadcd (Featire specs) ======= ======= >>>>>>> 8f1bc14 (Fix) >>>>>>> 49e3b70 (Fix) ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) >>>>>>> f1c7248 (Manifest_cache true) <<<<<<< HEAD >>>>>>> 9710ee6 (Manifest_cache true) ======= ======= ======= >>>>>>> 379e583 (Manifest_cache true) ======= >>>>>>> 4e81ea2 (Featire specs) >>>>>>> 1cb2e82 (Featire specs) <<<<<<< HEAD >>>>>>> 2fd2048 (Featire specs) ======= ======= >>>>>>> 8577deb (Featire specs) <<<<<<< HEAD >>>>>>> bc0ff2c (Featire specs) ======= ======= ======= >>>>>>> 7a02bbe (Featire specs) >>>>>>> ebe5361 (Featire specs) <<<<<<< HEAD >>>>>>> 9bf2aae (Featire specs) ======= ======= ======= >>>>>>> 4552227 (Featire specs) >>>>>>> d3d58e0 (Featire specs) <<<<<<< HEAD >>>>>>> 5ce1a6d (Featire specs) ======= ======= >>>>>>> 3bdfaec (After billing and shipping change redirect to prev path) >>>>>>> 20094c5 (After billing and shipping change redirect to prev path)